diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2021-09-11 09:24:35 +0300 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2021-09-13 10:05:18 +0300 |
commit | 3592bf772686867066c68754680d551e2f0a0f80 (patch) | |
tree | 7acc93bd198d09063388977d2d1816f0b1d38057 /gst | |
parent | 732b352df61d0cd33e3f43c86b5c10f1abd26549 (diff) |
matroska: Add support for muxing/demuxing ffv1
Previously only demuxing when stored via the RIFF/AVI mapping was
supported.
See https://github.com/FFmpeg/FFV1/blob/master/ffv1.md#matroska-file-format
Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues/923
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/1080>
Diffstat (limited to 'gst')
-rw-r--r-- | gst/matroska/matroska-demux.c | 13 | ||||
-rw-r--r-- | gst/matroska/matroska-ids.h | 1 | ||||
-rw-r--r-- | gst/matroska/matroska-mux.c | 9 |
3 files changed, 22 insertions, 1 deletions
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c index 75319bc95..1eb429f93 100644 --- a/gst/matroska/matroska-demux.c +++ b/gst/matroska/matroska-demux.c @@ -6623,6 +6623,19 @@ gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext * GST_WARNING ("No AV1 codec data found!"); } *codec_name = g_strdup_printf ("AOM AV1"); + } else if (!strcmp (codec_id, GST_MATROSKA_CODEC_ID_VIDEO_FFV1)) { + caps = + gst_caps_new_simple ("video/x-ffv", "ffvversion", G_TYPE_INT, 1, NULL); + if (data) { + GstBuffer *priv; + + priv = gst_buffer_new_memdup (data, size); + gst_caps_set_simple (caps, "codec_data", GST_TYPE_BUFFER, priv, NULL); + gst_buffer_unref (priv); + } else { + GST_WARNING ("No FFV1 codec data found!"); + } + *codec_name = g_strdup_printf ("FFMpeg v1"); } else if (!strcmp (codec_id, GST_MATROSKA_CODEC_ID_VIDEO_PRORES)) { guint32 fourcc; const gchar *variant, *variant_descr = ""; diff --git a/gst/matroska/matroska-ids.h b/gst/matroska/matroska-ids.h index ba44f104b..c4fc73caa 100644 --- a/gst/matroska/matroska-ids.h +++ b/gst/matroska/matroska-ids.h @@ -380,6 +380,7 @@ #define GST_MATROSKA_CODEC_ID_VIDEO_AV1 "V_AV1" #define GST_MATROSKA_CODEC_ID_VIDEO_MPEGH_HEVC "V_MPEGH/ISO/HEVC" #define GST_MATROSKA_CODEC_ID_VIDEO_PRORES "V_PRORES" +#define GST_MATROSKA_CODEC_ID_VIDEO_FFV1 "V_FFV1" #define GST_MATROSKA_CODEC_ID_AUDIO_MPEG1_L1 "A_MPEG/L1" #define GST_MATROSKA_CODEC_ID_AUDIO_MPEG1_L2 "A_MPEG/L2" diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c index 28970a6f1..c7a5adfd6 100644 --- a/gst/matroska/matroska-mux.c +++ b/gst/matroska/matroska-mux.c @@ -146,7 +146,8 @@ static GstStaticPadTemplate videosink_templ = "video/x-prores, " COMMON_VIDEO_CAPS "; " "video/x-wmv, " "wmvversion = (int) [ 1, 3 ], " COMMON_VIDEO_CAPS "; " - "video/x-av1, " COMMON_VIDEO_CAPS) + "video/x-av1, " COMMON_VIDEO_CAPS ";" + "video/x-ffv, ffversion = (int) 1, " COMMON_VIDEO_CAPS) ); #define COMMON_AUDIO_CAPS \ @@ -1344,6 +1345,12 @@ skip_details: if (codec_buf != NULL) gst_buffer_extract_dup (codec_buf, 0, gst_buffer_get_size (codec_buf), &context->codec_priv, &context->codec_priv_size); + } else if (!strcmp (mimetype, "video/x-ffv")) { + gst_matroska_mux_set_codec_id (context, GST_MATROSKA_CODEC_ID_VIDEO_FFV1); + gst_matroska_mux_free_codec_priv (context); + if (codec_buf != NULL) + gst_buffer_extract_dup (codec_buf, 0, gst_buffer_get_size (codec_buf), + &context->codec_priv, &context->codec_priv_size); } else if (!strcmp (mimetype, "video/mpeg")) { gint mpegversion; |