mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-30 07:42:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

smpte: Check if input caps are the same and create output caps from video info

Browse source 
This makes sure that also properties like the pixel-aspect-ratio are the same
between both streams and that the output caps contain all fields necessary for
complete video caps.

https://bugzilla.gnome.org/show_bug.cgi?id=735804
This commit is contained in:
Ravi Kiran K N 2014-09-02 13:52:43 +05:30 committed by Sebastian Dröge
parent 6ff397eccc
commit ea43ef214a
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst/smpte/gstsmpte.c
View file

@ -507,10 +507,7 @@ gst_smpte_collected (GstCollectPads * pads, GstSMPTE * smpte)
gst_buffer_unmap (in2, &map);
}
if (GST_VIDEO_INFO_WIDTH (&smpte->vinfo1) !=
GST_VIDEO_INFO_WIDTH (&smpte->vinfo2) ||
GST_VIDEO_INFO_HEIGHT (&smpte->vinfo1) !=
GST_VIDEO_INFO_HEIGHT (&smpte->vinfo2))
if (!gst_video_info_is_equal (&smpte->vinfo1, &smpte->vinfo2))
goto input_formats_do_not_match;
if (smpte->position < smpte->end_position) {
@ -521,12 +518,7 @@ gst_smpte_collected (GstCollectPads * pads, GstSMPTE * smpte)
GstCaps *caps;
GstSegment segment;
caps =
gst_caps_make_writable (gst_static_caps_get
(&gst_smpte_src_template.static_caps));
gst_caps_set_simple (caps, "width", G_TYPE_INT, smpte->width, "height",
G_TYPE_INT, smpte->height, "framerate", GST_TYPE_FRACTION,
smpte->fps_num, smpte->fps_denom, NULL);
caps = gst_video_info_to_caps (&smpte->vinfo1);
gst_pad_set_caps (smpte->srcpad, caps);
gst_caps_unref (caps);