[FFmpeg-cvslog] audio_frame_queue: Clean up ff_af_queue_log_state debug function
Diego Biurrun
git at videolan.org
Sun Aug 26 22:52:23 CEST 2012
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Sun Aug 26 12:44:05 2012 +0200| [d7f9786cbcd3fede7c751f1c1f481e55ee2380bd] | committer: Diego Biurrun
audio_frame_queue: Clean up ff_af_queue_log_state debug function
The function is debug-only, so only compile it in debug mode.
Make it static as it has no uses outside of the file.
Change av_log() to av_dlog().
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d7f9786cbcd3fede7c751f1c1f481e55ee2380bd
---
libavcodec/audio_frame_queue.c | 20 ++++++++++----------
libavcodec/audio_frame_queue.h | 7 -------
2 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/libavcodec/audio_frame_queue.c b/libavcodec/audio_frame_queue.c
index 1cd96a7..9b14386 100644
--- a/libavcodec/audio_frame_queue.c
+++ b/libavcodec/audio_frame_queue.c
@@ -87,7 +87,7 @@ int ff_af_queue_add(AudioFrameQueue *afq, const AVFrame *f)
afq->remaining_samples += f->nb_samples;
#ifdef DEBUG
- ff_af_queue_log_state(afq);
+ af_queue_log_state(afq);
#endif
return 0;
@@ -100,7 +100,7 @@ void ff_af_queue_remove(AudioFrameQueue *afq, int nb_samples, int64_t *pts,
int removed_samples = 0;
#ifdef DEBUG
- ff_af_queue_log_state(afq);
+ af_queue_log_state(afq);
#endif
/* get output pts from the next frame or generated pts */
@@ -146,18 +146,18 @@ void ff_af_queue_remove(AudioFrameQueue *afq, int nb_samples, int64_t *pts,
*duration = ff_samples_to_time_base(afq->avctx, removed_samples);
}
-void ff_af_queue_log_state(AudioFrameQueue *afq)
+#ifdef DEBUG
+static void af_queue_log_state(AudioFrameQueue *afq)
{
AudioFrame *f;
- av_log(afq->avctx, AV_LOG_DEBUG, "remaining delay = %d\n",
- afq->remaining_delay);
- av_log(afq->avctx, AV_LOG_DEBUG, "remaining samples = %d\n",
- afq->remaining_samples);
- av_log(afq->avctx, AV_LOG_DEBUG, "frames:\n");
+ av_dlog(afq->avctx, "remaining delay = %d\n", afq->remaining_delay);
+ av_dlog(afq->avctx, "remaining samples = %d\n", afq->remaining_samples);
+ av_dlog(afq->avctx, "frames:\n");
f = afq->frame_queue;
while (f) {
- av_log(afq->avctx, AV_LOG_DEBUG, " [ pts=%9"PRId64" duration=%d ]\n",
- f->pts, f->duration);
+ av_dlog(afq->avctx, " [ pts=%9"PRId64" duration=%d ]\n",
+ f->pts, f->duration);
f = f->next;
}
}
+#endif /* DEBUG */
diff --git a/libavcodec/audio_frame_queue.h b/libavcodec/audio_frame_queue.h
index cfcc6a0..4a29770 100644
--- a/libavcodec/audio_frame_queue.h
+++ b/libavcodec/audio_frame_queue.h
@@ -80,11 +80,4 @@ int ff_af_queue_add(AudioFrameQueue *afq, const AVFrame *f);
void ff_af_queue_remove(AudioFrameQueue *afq, int nb_samples, int64_t *pts,
int *duration);
-/**
- * Log the current state of the queue.
- *
- * @param afq queue context
- */
-void ff_af_queue_log_state(AudioFrameQueue *afq);
-
#endif /* AVCODEC_AUDIO_FRAME_QUEUE_H */
More information about the ffmpeg-cvslog
mailing list