FaSTTUBe/GST-Tensordecoder-ov_ep
61
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

videoaggregator: We can only convert the format if a GstVideoAggregatorConvertPad is used

Browse Source 
Otherwise assume that we can at least support any framerate.
This commit is contained in:
Sebastian Dröge 2019-07-16 10:40:16 +03:00
parent 0a21c28484
commit 5ebf6c2fac
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gst-libs/gst/video/gstvideoaggregator.c
View File

@ -1262,12 +1262,16 @@ gst_video_aggregator_pad_sink_getcaps (GstPad * pad, GstVideoAggregator * vagg,
n = gst_caps_get_size (srccaps); n = gst_caps_get_size (srccaps);
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
s = gst_caps_get_structure (srccaps, i); s = gst_caps_get_structure (srccaps, i);
gst_structure_set (s, "width", GST_TYPE_INT_RANGE, 1, G_MAXINT, gst_structure_set (s, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, G_MAXINT,
"height", GST_TYPE_INT_RANGE, 1, G_MAXINT, 1, NULL);
"framerate", GST_TYPE_FRACTION_RANGE, 0, 1, G_MAXINT, 1, NULL);
if (GST_IS_VIDEO_AGGREGATOR_CONVERT_PAD (pad)) {
gst_structure_set (s, "width", GST_TYPE_INT_RANGE, 1, G_MAXINT,
"height", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL);
gst_structure_remove_fields (s, "colorimetry", "chroma-site", "format", gst_structure_remove_fields (s, "colorimetry", "chroma-site", "format",
"pixel-aspect-ratio", NULL); "pixel-aspect-ratio", NULL);
}
if (has_interlace_mode) if (has_interlace_mode)
gst_structure_set (s, "interlace-mode", G_TYPE_STRING, gst_structure_set (s, "interlace-mode", G_TYPE_STRING,
gst_video_interlace_mode_to_string (interlace_mode), NULL); gst_video_interlace_mode_to_string (interlace_mode), NULL);
@ -2400,13 +2404,16 @@ gst_video_aggregator_pad_sink_acceptcaps (GstPad * pad,
n = gst_caps_get_size (accepted_caps); n = gst_caps_get_size (accepted_caps);
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
s = gst_caps_get_structure (accepted_caps, i); s = gst_caps_get_structure (accepted_caps, i);
gst_structure_set (s, "width", GST_TYPE_INT_RANGE, 1, G_MAXINT, gst_structure_set (s, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, G_MAXINT,
"height", GST_TYPE_INT_RANGE, 1, G_MAXINT, 1, NULL);
"framerate", GST_TYPE_FRACTION_RANGE, 0, 1, G_MAXINT, 1, NULL);
if (GST_IS_VIDEO_AGGREGATOR_CONVERT_PAD (pad)) {
gst_structure_set (s, "width", GST_TYPE_INT_RANGE, 1, G_MAXINT,
"height", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL);
gst_structure_remove_fields (s, "colorimetry", "chroma-site", "format", gst_structure_remove_fields (s, "colorimetry", "chroma-site", "format",
"pixel-aspect-ratio", NULL); "pixel-aspect-ratio", NULL);
} }
}
modified_caps = gst_caps_intersect (accepted_caps, template_caps); modified_caps = gst_caps_intersect (accepted_caps, template_caps);