aacenc: use the decoder's lcg PRNG

[ffmpeg] / libavcodec / mediacodecdec.c

diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c
index 6683de77518c4f74447daadee515987a30b50be4..8ff1138fdc89b6cb7ca691823014224b968de26c 100644 (file)
--- a/libavcodec/mediacodecdec.c
+++ b/libavcodec/mediacodecdec.c
@@ -437,7 +437,7 @@ static int mediacodec_dec_flush_codec(AVCodecContext *avctx, MediaCodecDecContex
     FFAMediaCodec *codec = s->codec;
     int status;
 
-    s->dequeued_buffer_nb = 0;
+    s->output_buffer_count = 0;
 
     s->draining = 0;
     s->flushing = 0;
@@ -449,9 +449,6 @@ static int mediacodec_dec_flush_codec(AVCodecContext *avctx, MediaCodecDecContex
         return AVERROR_EXTERNAL;
     }
 
-    s->first_buffer = 0;
-    s->first_buffer_at = av_gettime();
-
     return 0;
 }
 
@@ -468,7 +465,6 @@ int ff_mediacodec_dec_init(AVCodecContext *avctx, MediaCodecDecContext *s,
         AV_PIX_FMT_NONE,
     };
 
-    s->first_buffer_at = av_gettime();
     s->refcount = 1;
 
     pix_fmt = ff_get_format(avctx, pix_fmts);
@@ -634,7 +630,7 @@ int ff_mediacodec_dec_decode(AVCodecContext *avctx, MediaCodecDecContext *s,
         /* If the codec is flushing or need to be flushed, block for a fair
          * amount of time to ensure we got a frame */
         output_dequeue_timeout_us = OUTPUT_DEQUEUE_BLOCK_TIMEOUT_US;
-    } else if (s->dequeued_buffer_nb == 0) {
+    } else if (s->output_buffer_count == 0) {
         /* If the codec hasn't produced any frames, do not block so we
          * can push data to it as fast as possible, and get the first
          * frame */
@@ -645,10 +641,6 @@ int ff_mediacodec_dec_decode(AVCodecContext *avctx, MediaCodecDecContext *s,
     if (index >= 0) {
         int ret;
 
-        if (!s->first_buffer++) {
-            av_log(avctx, AV_LOG_DEBUG, "Got first buffer after %fms\n", (av_gettime() - s->first_buffer_at) / 1000);
-        }
-
         av_log(avctx, AV_LOG_DEBUG, "Got output buffer %zd"
                 " offset=%" PRIi32 " size=%" PRIi32 " ts=%" PRIi64
                 " flags=%" PRIu32 "\n", index, info.offset, info.size,
@@ -678,7 +670,7 @@ int ff_mediacodec_dec_decode(AVCodecContext *avctx, MediaCodecDecContext *s,
             }
 
             *got_frame = 1;
-            s->dequeued_buffer_nb++;
+            s->output_buffer_count++;
         } else {
             status = ff_AMediaCodec_releaseOutputBuffer(codec, index, 0);
             if (status < 0) {