mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 11:41:09 +00:00
Code Issues 1 Projects Releases Wiki Activity

libav: add av1 to gst_ffmpeg_caps_to_codecid

Browse source 
Restrict the stream-format to obu-stream
and the alignment to "tu" and "frame" as "obu"
is not properly supported by libav.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4248>
This commit is contained in:
Stéphane Cerveau 2023-03-22 12:52:08 +01:00 committed by GStreamer Marge Bot
parent 4c1de25e9d
commit 6f21ef9d3a
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subprojects/gst-libav/docs/gst_plugins_cache.json
View file

@ -137857,7 +137857,7 @@
"presence": "always" "presence": "always"
}, },
"video_%%u": { "video_%%u": {
"caps": "video/x-vp8:\nvideo/x-vp9:\nvideo/x-av1:\n", "caps": "video/x-vp8:\nvideo/x-vp9:\nvideo/x-av1:\n stream-format: obu-stream\n alignment: { (string)tu, (string)frame }\n",
"direction": "sink", "direction": "sink",
"presence": "request" "presence": "request"
} }

19
subprojects/gst-libav/ext/libav/gstavcodecmap.c
View file

@ -2358,7 +2358,21 @@ gst_ffmpeg_codecid_to_caps (enum AVCodecID codec_id,
case AV_CODEC_ID_AV1: case AV_CODEC_ID_AV1:
caps = caps =
gst_ff_vid_caps_new (context, NULL, codec_id, encode, "video/x-av1", gst_ff_vid_caps_new (context, NULL, codec_id, encode, "video/x-av1",
NULL); "stream-format", G_TYPE_STRING, "obu-stream", NULL);
if (encode) {
GValue arr = { 0, };
GValue item = { 0, };
g_value_init (&arr, GST_TYPE_LIST);
g_value_init (&item, G_TYPE_STRING);
g_value_set_string (&item, "tu");
gst_value_list_append_value (&arr, &item);
g_value_set_string (&item, "frame");
gst_value_list_append_value (&arr, &item);
g_value_unset (&item);
gst_caps_set_value (caps, "alignment", &arr);
g_value_unset (&arr);
}
break; break;
default: default:
GST_DEBUG ("Unknown codec ID %d, please add mapping here", codec_id); GST_DEBUG ("Unknown codec ID %d, please add mapping here", codec_id);
@ -4153,6 +4167,9 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context)
} else if (!strcmp (mimetype, "video/x-vp9")) { } else if (!strcmp (mimetype, "video/x-vp9")) {
id = AV_CODEC_ID_VP9; id = AV_CODEC_ID_VP9;
video = TRUE; video = TRUE;
} else if (!strcmp (mimetype, "video/x-av1")) {
id = AV_CODEC_ID_AV1;
video = TRUE;
} else if (!strcmp (mimetype, "video/x-flash-screen")) { } else if (!strcmp (mimetype, "video/x-flash-screen")) {
id = AV_CODEC_ID_FLASHSV; id = AV_CODEC_ID_FLASHSV;
video = TRUE; video = TRUE;