be more graceful when caps negotiation fails
Original commit message from CVS: be more graceful when caps negotiation fails
This commit is contained in:
parent
ffa5706370
commit
b24a690f25
@ -241,12 +241,14 @@ gst_videoscale_src_link (GstPad *pad, GstCaps *caps)
|
|||||||
return GST_PAD_LINK_DELAYED;
|
return GST_PAD_LINK_DELAYED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gst_caps_debug(caps,"ack");
|
||||||
|
|
||||||
videoscale->format = videoscale_find_by_caps (caps);
|
videoscale->format = videoscale_find_by_caps (caps);
|
||||||
|
g_return_val_if_fail(videoscale->format, GST_PAD_LINK_REFUSED);
|
||||||
|
|
||||||
gst_caps_get_int (caps, "width", &videoscale->to_width);
|
gst_caps_get_int (caps, "width", &videoscale->to_width);
|
||||||
gst_caps_get_int (caps, "height", &videoscale->to_height);
|
gst_caps_get_int (caps, "height", &videoscale->to_height);
|
||||||
|
|
||||||
gst_videoscale_setup(videoscale);
|
|
||||||
|
|
||||||
GST_DEBUG ("width %d height %d",videoscale->to_width,videoscale->to_height);
|
GST_DEBUG ("width %d height %d",videoscale->to_width,videoscale->to_height);
|
||||||
|
|
||||||
peercaps = gst_caps_copy(caps);
|
peercaps = gst_caps_copy(caps);
|
||||||
@ -283,12 +285,14 @@ gst_videoscale_sink_link (GstPad *pad, GstCaps *caps)
|
|||||||
return GST_PAD_LINK_DELAYED;
|
return GST_PAD_LINK_DELAYED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
videoscale->format = videoscale_find_by_caps (caps);
|
videoscale->format = videoscale_find_by_caps (caps);
|
||||||
|
gst_caps_debug(caps,"ack");
|
||||||
|
g_return_val_if_fail(videoscale->format, GST_PAD_LINK_REFUSED);
|
||||||
|
|
||||||
gst_caps_get_int (caps, "width", &videoscale->from_width);
|
gst_caps_get_int (caps, "width", &videoscale->from_width);
|
||||||
gst_caps_get_int (caps, "height", &videoscale->from_height);
|
gst_caps_get_int (caps, "height", &videoscale->from_height);
|
||||||
|
|
||||||
gst_videoscale_setup(videoscale);
|
|
||||||
|
|
||||||
peercaps = gst_caps_copy(caps);
|
peercaps = gst_caps_copy(caps);
|
||||||
|
|
||||||
if(videoscale->force_size){
|
if(videoscale->force_size){
|
||||||
|
Loading…
x
Reference in New Issue
Block a user