mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-22 08:17:01 +00:00
gst/playback/gstqueue2.c: Fix a division by zero when the max percent is <= 0. Fixes #446572. also update the bufferi...
Original commit message from CVS: Patches by: Thiago Sousa Santos <thiagossantos at gmail dot com> * gst/playback/gstqueue2.c: (update_buffering), (gst_queue_locked_enqueue): Fix a division by zero when the max percent is <= 0. Fixes #446572. also update the buffering status when receiving events. Fixes #446551.
This commit is contained in:
parent
27d8c58438
commit
c26bff1afc
1 changed files with 9 additions and 6 deletions
|
@ -642,7 +642,7 @@ update_buffering (GstQueue * queue)
|
||||||
gint percent;
|
gint percent;
|
||||||
gboolean post = FALSE;
|
gboolean post = FALSE;
|
||||||
|
|
||||||
if (!queue->use_buffering)
|
if (!queue->use_buffering || queue->high_percent <= 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
#define GET_PERCENT(format) ((queue->max_level.format) > 0 ? \
|
#define GET_PERCENT(format) ((queue->max_level.format) > 0 ? \
|
||||||
|
@ -997,8 +997,6 @@ gst_queue_locked_enqueue (GstQueue * queue, gpointer item)
|
||||||
apply_buffer (queue, buffer, &queue->sink_segment);
|
apply_buffer (queue, buffer, &queue->sink_segment);
|
||||||
/* update the byterate stats */
|
/* update the byterate stats */
|
||||||
update_rates (queue);
|
update_rates (queue);
|
||||||
/* update the buffering status */
|
|
||||||
update_buffering (queue);
|
|
||||||
|
|
||||||
if (QUEUE_IS_USING_TEMP_FILE (queue)) {
|
if (QUEUE_IS_USING_TEMP_FILE (queue)) {
|
||||||
gst_queue_write_buffer_to_file (queue, buffer);
|
gst_queue_write_buffer_to_file (queue, buffer);
|
||||||
|
@ -1039,9 +1037,14 @@ gst_queue_locked_enqueue (GstQueue * queue, gpointer item)
|
||||||
item = NULL;
|
item = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!QUEUE_IS_USING_TEMP_FILE (queue) && item)
|
if (item) {
|
||||||
|
/* update the buffering status */
|
||||||
|
update_buffering (queue);
|
||||||
|
|
||||||
|
if (!QUEUE_IS_USING_TEMP_FILE (queue))
|
||||||
g_queue_push_tail (queue->queue, item);
|
g_queue_push_tail (queue->queue, item);
|
||||||
GST_QUEUE_SIGNAL_ADD (queue);
|
GST_QUEUE_SIGNAL_ADD (queue);
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue