mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-17 21:06:17 +00:00
gst/gstpad.c (gst_pad_get_range, gst_pad_pull_range): Allow getrange() to return buffers with other caps, while we fi...
Original commit message from CVS: 2007-01-13 Andy Wingo <wingo@pobox.com> * gst/gstpad.c (gst_pad_get_range, gst_pad_pull_range): Allow getrange() to return buffers with other caps, while we fix demuxers and typefind, or otherwise change part-negotiation.txt.
This commit is contained in:
parent
3482d79879
commit
63693a682a
2 changed files with 26 additions and 0 deletions
|
@ -1,3 +1,9 @@
|
|||
2007-01-13 Andy Wingo <wingo@pobox.com>
|
||||
|
||||
* gst/gstpad.c (gst_pad_get_range, gst_pad_pull_range): Allow
|
||||
getrange() to return buffers with other caps, while we fix
|
||||
demuxers and typefind, or otherwise change part-negotiation.txt.
|
||||
|
||||
2007-01-12 Andy Wingo <wingo@pobox.com>
|
||||
|
||||
* libs/gst/base/gstbasetransform.c (gst_base_transform_activate):
|
||||
|
|
20
gst/gstpad.c
20
gst/gstpad.c
|
@ -3793,11 +3793,21 @@ dropping:
|
|||
}
|
||||
not_negotiated:
|
||||
{
|
||||
/* ideally we want to use the commented-out code, but currently demuxers and
|
||||
* typefind do not follow part-negotiation.txt. When switching into pull
|
||||
* mode, typefind should probably return the found caps from getcaps(), and
|
||||
* demuxers should do the setcaps(). */
|
||||
|
||||
#if 0
|
||||
gst_buffer_unref (*buffer);
|
||||
*buffer = NULL;
|
||||
GST_CAT_WARNING_OBJECT (GST_CAT_SCHEDULING, pad,
|
||||
"getrange returned buffer of different caps");
|
||||
return GST_FLOW_NOT_NEGOTIATED;
|
||||
#endif
|
||||
GST_CAT_DEBUG_OBJECT (GST_CAT_SCHEDULING, pad,
|
||||
"getrange returned buffer of different caps");
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -3904,11 +3914,21 @@ dropping:
|
|||
}
|
||||
not_negotiated:
|
||||
{
|
||||
/* ideally we want to use the commented-out code, but currently demuxers and
|
||||
* typefind do not follow part-negotiation.txt. When switching into pull
|
||||
* mode, typefind should probably return the found caps from getcaps(), and
|
||||
* demuxers should do the setcaps(). */
|
||||
|
||||
#if 0
|
||||
gst_buffer_unref (*buffer);
|
||||
*buffer = NULL;
|
||||
GST_CAT_WARNING_OBJECT (GST_CAT_SCHEDULING, pad,
|
||||
"pullrange returned buffer of different caps");
|
||||
return GST_FLOW_NOT_NEGOTIATED;
|
||||
#endif
|
||||
GST_CAT_DEBUG_OBJECT (GST_CAT_SCHEDULING, pad,
|
||||
"pullrange returned buffer of different caps");
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue