adpcm: Convert to the new bitstream header

[ffmpeg] / libavcodec / audio_frame_queue.c

diff --git a/libavcodec/audio_frame_queue.c b/libavcodec/audio_frame_queue.c
index 80f31008b0a973ab6d71f53268c2f78c706d4ed1..c4ca02b01f4d11e93ec6a58f3b579322f9062293 100644 (file)
--- a/libavcodec/audio_frame_queue.c
+++ b/libavcodec/audio_frame_queue.c
@@ -19,17 +19,18 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/attributes.h"
 #include "libavutil/common.h"
 #include "libavutil/mathematics.h"
 #include "internal.h"
 #include "audio_frame_queue.h"
 
-void ff_af_queue_init(AVCodecContext *avctx, AudioFrameQueue *afq)
+av_cold void ff_af_queue_init(AVCodecContext *avctx, AudioFrameQueue *afq)
 {
     afq->avctx             = avctx;
     afq->next_pts          = AV_NOPTS_VALUE;
-    afq->remaining_delay   = avctx->delay;
-    afq->remaining_samples = avctx->delay;
+    afq->remaining_delay   = avctx->initial_padding;
+    afq->remaining_samples = avctx->initial_padding;
     afq->frame_queue       = NULL;
 }
 
@@ -55,12 +56,12 @@ void ff_af_queue_close(AudioFrameQueue *afq)
 static void af_queue_log_state(AudioFrameQueue *afq)
 {
     AudioFrame *f;
-    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");
+    ff_dlog(afq->avctx, "remaining delay   = %d\n", afq->remaining_delay);
+    ff_dlog(afq->avctx, "remaining samples = %d\n", afq->remaining_samples);
+    ff_dlog(afq->avctx, "frames:\n");
     f = afq->frame_queue;
     while (f) {
-        av_dlog(afq->avctx, "  [ pts=%9"PRId64" duration=%d ]\n",
+        ff_dlog(afq->avctx, "  [ pts=%9"PRId64" duration=%d ]\n",
                 f->pts, f->duration);
         f = f->next;
     }
@@ -110,7 +111,7 @@ 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)
+                        int64_t *duration)
 {
     int64_t out_pts = AV_NOPTS_VALUE;
     int removed_samples = 0;