mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

h264parser: fix size caps to report cropped dimensions.

Browse source 
Restore the original h264parser behaviour to report cropped dimensions
in size caps.

https://bugzilla.gnome.org/show_bug.cgi?id=694068

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
This commit is contained in:
Gwenole Beauchesne 2013-07-09 11:39:46 +02:00 committed by Sebastian Dröge
parent ac9c1ae5a8
commit 18984f98dd
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gst/videoparsers/gsth264parse.c
View file

@ -1159,12 +1159,22 @@ gst_h264_parse_update_src_caps (GstH264Parse * h264parse, GstCaps * caps)
if (G_UNLIKELY (!sps)) { if (G_UNLIKELY (!sps)) {
caps = gst_caps_copy (sink_caps); caps = gst_caps_copy (sink_caps);
} else { } else {
if (G_UNLIKELY (h264parse->width != sps->width || gint crop_width, crop_height;
h264parse->height != sps->height)) {
if (sps->frame_cropping_flag) {
crop_width = sps->crop_rect_width;
crop_height = sps->crop_rect_height;
} else {
crop_width = sps->width;
crop_height = sps->height;
}
if (G_UNLIKELY (h264parse->width != crop_width ||
h264parse->height != crop_height)) {
GST_INFO_OBJECT (h264parse, "resolution changed %dx%d", GST_INFO_OBJECT (h264parse, "resolution changed %dx%d",
sps->width, sps->height); crop_width, crop_height);
h264parse->width = sps->width; h264parse->width = crop_width;
h264parse->height = sps->height; h264parse->height = crop_height;
modified = TRUE; modified = TRUE;
} }
@ -1214,12 +1224,12 @@ gst_h264_parse_update_src_caps (GstH264Parse * h264parse, GstCaps * caps)
if (s && gst_structure_has_field (s, "width")) if (s && gst_structure_has_field (s, "width"))
gst_structure_get_int (s, "width", &width); gst_structure_get_int (s, "width", &width);
else else
width = sps->width; width = h264parse->width;
if (s && gst_structure_has_field (s, "height")) if (s && gst_structure_has_field (s, "height"))
gst_structure_get_int (s, "height", &height); gst_structure_get_int (s, "height", &height);
else else
height = sps->height; height = h264parse->height;
gst_caps_set_simple (caps, "width", G_TYPE_INT, width, gst_caps_set_simple (caps, "width", G_TYPE_INT, width,
"height", G_TYPE_INT, height, NULL); "height", G_TYPE_INT, height, NULL);