mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-03 15:06:34 +00:00
Code Issues 1 Projects Releases Wiki Activity

wavparse: Fix ignoring of last chunk in push mode

Browse source 
In push mode (streaming), if the last audio payload chunk is less than the segment rate buffer size, it would be ignored since the plugin waits until it has at least segment rate bufer size of audio.

The fix is to introduce a flushing flag that indicates that no more audio will be available so that the plugin can recognize this condition and flush the data is has even if it is less
than the desired segment rate buffer size.
This commit is contained in:
Amr Mahdi 2019-08-07 12:09:46 +00:00 committed by Sebastian Dröge
parent 3c4add469e
commit 5f01b9da05
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gst/wavparse/gstwavparse.c
View file

@ -1972,7 +1972,7 @@ gst_wavparse_add_src_pad (GstWavParse * wav, GstBuffer * buf)
}
static GstFlowReturn
gst_wavparse_stream_data (GstWavParse * wav)
gst_wavparse_stream_data (GstWavParse * wav, gboolean flushing)
{
GstBuffer *buf = NULL;
GstFlowReturn res = GST_FLOW_OK;
@ -2054,10 +2054,21 @@ iterate_adapter:
if (avail < desired) {
GST_LOG_OBJECT (wav, "Got only %u bytes of data from the sinkpad", avail);
return GST_FLOW_OK;
}
buf = gst_adapter_take_buffer (wav->adapter, desired);
/* If we are at the end of the stream, we need to flush whatever we have left */
if (avail > 0 && flushing) {
if (avail >= wav->blockalign && wav->blockalign > 0) {
avail -= (avail % wav->blockalign);
buf = gst_adapter_take_buffer (wav->adapter, avail);
} else {
return GST_FLOW_OK;
}
} else {
return GST_FLOW_OK;
}
} else {
buf = gst_adapter_take_buffer (wav->adapter, desired);
}
} else {
if ((res = gst_pad_pull_range (wav->sinkpad, wav->offset,
desired, &buf)) != GST_FLOW_OK)
@ -2237,7 +2248,7 @@ gst_wavparse_loop (GstPad * pad)
/* fall-through */
case GST_WAVPARSE_DATA:
if ((ret = gst_wavparse_stream_data (wav)) != GST_FLOW_OK)
if ((ret = gst_wavparse_stream_data (wav, FALSE)) != GST_FLOW_OK)
goto pause;
break;
default:
@ -2337,7 +2348,7 @@ gst_wavparse_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
case GST_WAVPARSE_DATA:
if (buf && GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_DISCONT))
wav->discont = TRUE;
if ((ret = gst_wavparse_stream_data (wav)) != GST_FLOW_OK)
if ((ret = gst_wavparse_stream_data (wav, FALSE)) != GST_FLOW_OK)
goto done;
break;
default:
@ -2361,7 +2372,7 @@ gst_wavparse_flush_data (GstWavParse * wav)
guint av;
if ((av = gst_adapter_available (wav->adapter)) > 0) {
ret = gst_wavparse_stream_data (wav);
ret = gst_wavparse_stream_data (wav, TRUE);
}
return ret;