diff options
| author | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2021-04-23 19:01:54 +0200 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2021-05-21 09:36:26 +0000 |
| commit | 7a25c5d4ec95aefeca6515ac023b23c5dd330194 (patch) | |
| tree | 754761e40934afc090e4da8a72fd6b1cd012e4cb | |
| parent | b3d9c5bf803d282b0581eec338c3ae2ecfe0a4e1 (diff) | |
| download | gstreamer-vaapi-7a25c5d4ec95aefeca6515ac023b23c5dd330194.tar.gz | |
vaapi: Demote vaapidecodebin to rank NONE.
One of the main reasons of vaapidecodebin was because it mitigated the
possible surface exhaustion. But that problem is currently
solved. Nowadays, vaapidecodebin brings more problems than it
solves. Thus this patch demotes vaapidecodebin to NONE rank while
bumping PRIMARY + 1 the most common decoders.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/-/merge_requests/426>
| -rw-r--r-- | gst/vaapi/gstvaapi.c | 2 | ||||
| -rw-r--r-- | gst/vaapi/gstvaapidecode.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/gst/vaapi/gstvaapi.c b/gst/vaapi/gstvaapi.c index 35326248..56ee703f 100644 --- a/gst/vaapi/gstvaapi.c +++ b/gst/vaapi/gstvaapi.c @@ -210,7 +210,7 @@ plugin_init (GstPlugin * plugin) GST_RANK_NONE, GST_TYPE_VAAPIPOSTPROC); gst_element_register (plugin, "vaapidecodebin", - GST_RANK_PRIMARY + 2, GST_TYPE_VAAPI_DECODE_BIN); + GST_RANK_NONE, GST_TYPE_VAAPI_DECODE_BIN); rank = GST_RANK_SECONDARY; if (g_getenv ("WAYLAND_DISPLAY")) diff --git a/gst/vaapi/gstvaapidecode.c b/gst/vaapi/gstvaapidecode.c index 76d1bc47..4e8d35fb 100644 --- a/gst/vaapi/gstvaapidecode.c +++ b/gst/vaapi/gstvaapidecode.c @@ -115,14 +115,14 @@ static const GstVaapiDecoderMap vaapi_decode_map[] = { {GST_VAAPI_CODEC_MPEG4, GST_RANK_PRIMARY, "mpeg4", "video/mpeg, mpegversion=4", NULL}, {GST_VAAPI_CODEC_H263, GST_RANK_PRIMARY, "h263", "video/x-h263", NULL}, - {GST_VAAPI_CODEC_H264, GST_RANK_PRIMARY, "h264", "video/x-h264", + {GST_VAAPI_CODEC_H264, GST_RANK_PRIMARY + 1, "h264", "video/x-h264", gst_vaapi_decode_h264_install_properties}, - {GST_VAAPI_CODEC_VC1, GST_RANK_PRIMARY, "vc1", + {GST_VAAPI_CODEC_VC1, GST_RANK_PRIMARY + 1, "vc1", "video/x-wmv, wmvversion=3, format={WMV3,WVC1}", NULL}, - {GST_VAAPI_CODEC_VP8, GST_RANK_PRIMARY, "vp8", "video/x-vp8", NULL}, - {GST_VAAPI_CODEC_VP9, GST_RANK_PRIMARY, "vp9", "video/x-vp9", NULL}, - {GST_VAAPI_CODEC_H265, GST_RANK_PRIMARY, "h265", "video/x-h265", NULL}, - {GST_VAAPI_CODEC_AV1, GST_RANK_PRIMARY, "av1", "video/x-av1", NULL}, + {GST_VAAPI_CODEC_VP8, GST_RANK_PRIMARY + 1, "vp8", "video/x-vp8", NULL}, + {GST_VAAPI_CODEC_VP9, GST_RANK_PRIMARY + 1, "vp9", "video/x-vp9", NULL}, + {GST_VAAPI_CODEC_H265, GST_RANK_PRIMARY + 1, "h265", "video/x-h265", NULL}, + {GST_VAAPI_CODEC_AV1, GST_RANK_PRIMARY + 1, "av1", "video/x-av1", NULL}, {0 /* the rest */ , GST_RANK_PRIMARY + 1, NULL, gst_vaapidecode_sink_caps_str, NULL}, }; |