On Tue, Oct 11, 2016 at 10:24 AM, Matthieu Bouron <matthieu.bou...@gmail.com
> wrote:
>
>
> On Thu, Oct 6, 2016 at 2:31 PM, Matthieu Bouron <matthieu.bou...@gmail.com
> > wrote:
>
>> From: Matthieu Bouron <matthieu.bou...@stupeflix.com>
>>
>> ---
>> libavcodec/mediacodecdec.c | 6 +++---
>> libavcodec/mediacodecdec.h | 2 +-
>> 2 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c
>> index 2ab173b..3d519ca 100644
>> --- a/libavcodec/mediacodecdec.c
>> +++ b/libavcodec/mediacodecdec.c
>> @@ -427,7 +427,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;
>> @@ -621,7 +621,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 */
>> @@ -661,7 +661,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 52c8bf1..7b0b7bb 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;
>>
>> --
>> 2.10.0
>>
>>
> If there is no objection I will push both patches in a few hours.
>
Applied.
[...]
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
