openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-24 03:39:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lavc/mediacodecdec: rename dequeued_buffer_nb to output_buffer_count

Browse Source
This commit is contained in:
Matthieu Bouron 2016-10-06 11:56:24 +02:00
parent a458ed65b5
commit cfa3c2655a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mediacodecdec.c
View File

@ -437,7 +437,7 @@ static int mediacodec_dec_flush_codec(AVCodecContext *avctx, MediaCodecDecContex
FFAMediaCodec *codec = s->codec; FFAMediaCodec *codec = s->codec;
int status; int status;
s->dequeued_buffer_nb = 0; s->output_buffer_count = 0;
s->draining = 0; s->draining = 0;
s->flushing = 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 /* If the codec is flushing or need to be flushed, block for a fair
* amount of time to ensure we got a frame */ * amount of time to ensure we got a frame */
output_dequeue_timeout_us = OUTPUT_DEQUEUE_BLOCK_TIMEOUT_US; 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 /* 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 * can push data to it as fast as possible, and get the first
* frame */ * frame */
@ -670,7 +670,7 @@ int ff_mediacodec_dec_decode(AVCodecContext *avctx, MediaCodecDecContext *s,
} }
*got_frame = 1; *got_frame = 1;
s->dequeued_buffer_nb++; s->output_buffer_count++;
} else { } else {
status = ff_AMediaCodec_releaseOutputBuffer(codec, index, 0); status = ff_AMediaCodec_releaseOutputBuffer(codec, index, 0);
if (status < 0) { if (status < 0) {

2
libavcodec/mediacodecdec.h
View File

@ -59,7 +59,7 @@ typedef struct MediaCodecDecContext {
int crop_left; int crop_left;
int crop_right; int crop_right;
uint64_t dequeued_buffer_nb; uint64_t output_buffer_count;
} MediaCodecDecContext; } MediaCodecDecContext;