mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 04:56:14 +00:00
Code Issues 1 Projects Releases Wiki Activity

audioaggregator: Improve log messages

Browse source 
Make the level of log messages saner and improve some.
This commit is contained in:
Olivier Crête 2015-11-02 19:40:28 -05:00
parent 9deb334251
commit f0cbeb4140
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gst/audiomixer/gstaudioaggregator.c
View file

@ -829,7 +829,7 @@ gst_audio_aggregator_fill_buffer (GstAudioAggregator * aagg,
if (discont) { if (discont) {
/* Have discont, need resync */ /* Have discont, need resync */
if (pad->priv->next_offset != -1) if (pad->priv->next_offset != -1)
GST_INFO_OBJECT (pad, "Have discont. Expected %" GST_DEBUG_OBJECT (pad, "Have discont. Expected %"
G_GUINT64_FORMAT ", got %" G_GUINT64_FORMAT, G_GUINT64_FORMAT ", got %" G_GUINT64_FORMAT,
pad->priv->next_offset, start_offset); pad->priv->next_offset, start_offset);
pad->priv->output_offset = -1; pad->priv->output_offset = -1;
@ -995,7 +995,7 @@ gst_audio_aggregator_mix_buffer (GstAudioAggregator * aagg,
if (pad->priv->position == pad->priv->size) { if (pad->priv->position == pad->priv->size) {
/* Buffer done, drop it */ /* Buffer done, drop it */
gst_buffer_replace (&pad->priv->buffer, NULL); gst_buffer_replace (&pad->priv->buffer, NULL);
GST_DEBUG_OBJECT (pad, "Finished mixing buffer, waiting for next"); GST_LOG_OBJECT (pad, "Finished mixing buffer, waiting for next");
return FALSE; return FALSE;
} }
@ -1194,8 +1194,8 @@ gst_audio_aggregator_aggregate (GstAggregator * agg, gboolean timeout)
if (timeout) { if (timeout) {
if (pad->priv->output_offset < next_offset) { if (pad->priv->output_offset < next_offset) {
gint64 diff = next_offset - pad->priv->output_offset; gint64 diff = next_offset - pad->priv->output_offset;
GST_LOG_OBJECT (pad, "Timeout, missing %" G_GINT64_FORMAT " frames (%" GST_DEBUG_OBJECT (pad, "Timeout, missing %" G_GINT64_FORMAT
GST_TIME_FORMAT ")", diff, " frames (%" GST_TIME_FORMAT ")", diff,
GST_TIME_ARGS (gst_util_uint64_scale (diff, GST_SECOND, GST_TIME_ARGS (gst_util_uint64_scale (diff, GST_SECOND,
GST_AUDIO_INFO_RATE (&aagg->info)))); GST_AUDIO_INFO_RATE (&aagg->info))));
} }
@ -1241,7 +1241,7 @@ gst_audio_aggregator_aggregate (GstAggregator * agg, gboolean timeout)
pad->priv->output_offset += diff; pad->priv->output_offset += diff;
if (pad->priv->position == pad->priv->size) { if (pad->priv->position == pad->priv->size) {
GST_LOG_OBJECT (pad, "Buffer was late by %" GST_TIME_FORMAT GST_DEBUG_OBJECT (pad, "Buffer was late by %" GST_TIME_FORMAT
", dropping %" GST_PTR_FORMAT, ", dropping %" GST_PTR_FORMAT,
GST_TIME_ARGS (gst_util_uint64_scale (odiff, GST_SECOND, GST_TIME_ARGS (gst_util_uint64_scale (odiff, GST_SECOND,
GST_AUDIO_INFO_RATE (&aagg->info))), pad->priv->buffer); GST_AUDIO_INFO_RATE (&aagg->info))), pad->priv->buffer);
@ -1262,8 +1262,8 @@ gst_audio_aggregator_aggregate (GstAggregator * agg, gboolean timeout)
drop_buf = !gst_audio_aggregator_mix_buffer (aagg, pad, pad->priv->buffer, drop_buf = !gst_audio_aggregator_mix_buffer (aagg, pad, pad->priv->buffer,
outbuf); outbuf);
if (pad->priv->output_offset >= next_offset) { if (pad->priv->output_offset >= next_offset) {
GST_DEBUG_OBJECT (pad, GST_LOG_OBJECT (pad,
"Pad is after current offset: %" G_GUINT64_FORMAT " >= %" "Pad is at or after current offset: %" G_GUINT64_FORMAT " >= %"
G_GINT64_FORMAT, pad->priv->output_offset, next_offset); G_GINT64_FORMAT, pad->priv->output_offset, next_offset);
} else { } else {
is_done = FALSE; is_done = FALSE;
@ -1279,15 +1279,15 @@ gst_audio_aggregator_aggregate (GstAggregator * agg, gboolean timeout)
if (dropped) { if (dropped) {
/* We dropped a buffer, retry */ /* We dropped a buffer, retry */
GST_INFO_OBJECT (aagg, "A pad dropped a buffer, wait for the next one"); GST_LOG_OBJECT (aagg, "A pad dropped a buffer, wait for the next one");
GST_AUDIO_AGGREGATOR_UNLOCK (aagg); GST_AUDIO_AGGREGATOR_UNLOCK (aagg);
return GST_FLOW_OK; return GST_FLOW_OK;
} }
if (!is_done && !is_eos) { if (!is_done && !is_eos) {
/* Get more buffers */ /* Get more buffers */
GST_INFO_OBJECT (aagg, GST_LOG_OBJECT (aagg,
"We're not done yet for the current offset," " waiting for more data"); "We're not done yet for the current offset, waiting for more data");
GST_AUDIO_AGGREGATOR_UNLOCK (aagg); GST_AUDIO_AGGREGATOR_UNLOCK (aagg);
return GST_FLOW_OK; return GST_FLOW_OK;
} }