virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/rkmpp : remove stream start retries before first frame.

Browse Source 
those were needed because of some odd mpp behavior that seems to have
been fixed.

Makes the code cleaner.

Signed-off-by: wm4 <nfxjfg@googlemail.com>
This commit is contained in:
LongChair 2018-01-02 12:38:01 +01:00 committed by wm4
parent c6f8410636
commit 2ca65fc7b7
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/rkmppdec.c
View File

@ -47,7 +47,6 @@ typedef struct {
MppApi *mpi; MppApi *mpi;
MppBufferGroup frame_group; MppBufferGroup frame_group;
char first_frame;
char first_packet; char first_packet;
char eos_reached; char eos_reached;
@ -329,29 +328,15 @@ static int rkmpp_retrieve_frame(AVCodecContext *avctx, AVFrame *frame)
MppBuffer buffer = NULL; MppBuffer buffer = NULL;
AVDRMFrameDescriptor *desc = NULL; AVDRMFrameDescriptor *desc = NULL;
AVDRMLayerDescriptor *layer = NULL; AVDRMLayerDescriptor *layer = NULL;
int retrycount = 0;
int mode; int mode;
MppFrameFormat mppformat; MppFrameFormat mppformat;
uint32_t drmformat; uint32_t drmformat;
// on start of decoding, MPP can return -1, which is supposed to be expected
// this is due to some internal MPP init which is not completed, that will
// only happen in the first few frames queries, but should not be interpreted
// as an error, Therefore we need to retry a couple times when we get -1
// in order to let it time to complete it's init, then we sleep a bit between retries.
retry_get_frame:
ret = decoder->mpi->decode_get_frame(decoder->ctx, &mppframe); ret = decoder->mpi->decode_get_frame(decoder->ctx, &mppframe);
if (ret != MPP_OK && ret != MPP_ERR_TIMEOUT && !decoder->first_frame) { if (ret != MPP_OK && ret != MPP_ERR_TIMEOUT) {
if (retrycount < 5) {
av_log(avctx, AV_LOG_DEBUG, "Failed to get a frame, retrying (code = %d, retrycount = %d)\n", ret, retrycount);
usleep(10000);
retrycount++;
goto retry_get_frame;
} else {
av_log(avctx, AV_LOG_ERROR, "Failed to get a frame from MPP (code = %d)\n", ret); av_log(avctx, AV_LOG_ERROR, "Failed to get a frame from MPP (code = %d)\n", ret);
goto fail; goto fail;
} }
}
if (mppframe) { if (mppframe) {
// Check whether we have a special frame or not // Check whether we have a special frame or not
@ -366,7 +351,6 @@ retry_get_frame:
avctx->height = mpp_frame_get_height(mppframe); avctx->height = mpp_frame_get_height(mppframe);
decoder->mpi->control(decoder->ctx, MPP_DEC_SET_INFO_CHANGE_READY, NULL); decoder->mpi->control(decoder->ctx, MPP_DEC_SET_INFO_CHANGE_READY, NULL);
decoder->first_frame = 1;
av_buffer_unref(&decoder->frames_ref); av_buffer_unref(&decoder->frames_ref);
@ -480,7 +464,6 @@ retry_get_frame:
goto fail; goto fail;
} }
decoder->first_frame = 0;
return 0; return 0;
} else { } else {
av_log(avctx, AV_LOG_ERROR, "Failed to retrieve the frame buffer, frame is dropped (code = %d)\n", ret); av_log(avctx, AV_LOG_ERROR, "Failed to retrieve the frame buffer, frame is dropped (code = %d)\n", ret);
@ -560,7 +543,6 @@ static void rkmpp_flush(AVCodecContext *avctx)
ret = decoder->mpi->reset(decoder->ctx); ret = decoder->mpi->reset(decoder->ctx);
if (ret == MPP_OK) { if (ret == MPP_OK) {
decoder->first_frame = 1;
decoder->first_packet = 1; decoder->first_packet = 1;
} else } else
av_log(avctx, AV_LOG_ERROR, "Failed to reset MPI (code = %d)\n", ret); av_log(avctx, AV_LOG_ERROR, "Failed to reset MPI (code = %d)\n", ret);