diff options
| author | Matthieu Bouron <matthieu.bouron@stupeflix.com> | 2016-10-06 11:56:24 +0200 |
|---|---|---|
| committer | Matthieu Bouron <matthieu.bouron@stupeflix.com> | 2016-10-12 09:50:42 +0200 |
| commit | cfa3c2655ac2bafe7b76f1e68c8fe6ecee03f1a8 (patch) | |
| tree | 01155ce3f85acf93a7119f960f251a777011b66e | |
| parent | a458ed65b5d1007a9184226edd39fa78d01f694b (diff) | |
| download | ffmpeg-cfa3c2655ac2bafe7b76f1e68c8fe6ecee03f1a8.tar.gz | |
lavc/mediacodecdec: rename dequeued_buffer_nb to output_buffer_count
| -rw-r--r-- | libavcodec/mediacodecdec.c | 6 | ||||
| -rw-r--r-- | libavcodec/mediacodecdec.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c index e0d71d3109..8ff1138fdc 100644 --- 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; @@ -630,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 */ @@ -670,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) { diff --git a/libavcodec/mediacodecdec.h b/libavcodec/mediacodecdec.h index 52c8bf17c9..7b0b7bb9f2 100644 --- a/libavcodec/mediacodecdec.h +++ b/libavcodec/mediacodecdec.h @@ -59,7 +59,7 @@ typedef struct MediaCodecDecContext { int crop_left; int crop_right; - uint64_t dequeued_buffer_nb; + uint64_t output_buffer_count; } MediaCodecDecContext; |