mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-08-02 03:35:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

hlsdemux: only typefind when we have a minimum amount of data

Browse source 
For small amounts some data might be mistyped and it would cause
the pipeline to fail. For example if you have AAC inside mpegts,
for small amounts, the AAC samples would cause the typefinder to
think it is AAC and not mpegts.

https://bugzilla.gnome.org/show_bug.cgi?id=736061
This commit is contained in:
Thiago Santos 2014-12-30 08:07:18 -03:00
parent 196d9c4829
commit 104bd7cf02
1 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
ext/hls/gsthlsdemux.c
View file

@ -664,12 +664,31 @@ gst_hls_demux_chunk_received (GstAdaptiveDemux * demux,
buffer = *chunk;
if (G_UNLIKELY (hlsdemux->do_typefind && buffer != NULL)) {
GstCaps *caps;
GstCaps *caps = NULL;
GstMapInfo info;
guint buffer_size;
GstTypeFindProbability prob = GST_TYPE_FIND_NONE;
gst_buffer_map (buffer, &info, GST_MAP_READ);
buffer_size = info.size;
/* Typefind could miss if buffer is too small. In this case we
* will retry later */
if (buffer_size >= (2 * 1024)) {
caps =
gst_type_find_helper_for_data (GST_OBJECT_CAST (hlsdemux), info.data,
info.size, &prob);
}
gst_buffer_unmap (buffer, &info);
caps = gst_type_find_helper_for_buffer (NULL, buffer, NULL);
if (G_UNLIKELY (!caps)) {
/* Typefind could fail if buffer is too small. Retry later */
if (gst_buffer_get_size (buffer) < (2 * 1024 * 1024)) {
/* Only fail typefinding if we already a good amount of data
* and we still don't know the type */
if (buffer_size > (2 * 1024 * 1024)) {
GST_ELEMENT_ERROR (hlsdemux, STREAM, TYPE_NOT_FOUND,
("Could not determine type of stream"), (NULL));
return GST_FLOW_NOT_NEGOTIATED;
} else {
if (hlsdemux->pending_buffer)
hlsdemux->pending_buffer =
gst_buffer_append (buffer, hlsdemux->pending_buffer);
@ -678,11 +697,11 @@ gst_hls_demux_chunk_received (GstAdaptiveDemux * demux,
*chunk = NULL;
return GST_FLOW_OK;
}
GST_ELEMENT_ERROR (hlsdemux, STREAM, TYPE_NOT_FOUND,
("Could not determine type of stream"), (NULL));
return GST_FLOW_NOT_NEGOTIATED;
}
GST_DEBUG_OBJECT (hlsdemux, "Typefind result: %" GST_PTR_FORMAT " prob:%d",
caps, prob);
if (!hlsdemux->input_caps
|| !gst_caps_is_equal (caps, hlsdemux->input_caps)) {
gst_caps_replace (&hlsdemux->input_caps, caps);