diff options
| author | Dave Stevenson <dave.stevenson@raspberrypi.org> | 2019-01-17 17:39:34 +0000 |
|---|---|---|
| committer | Aman Gupta <aman@tmm1.net> | 2019-08-23 17:11:37 -0700 |
| commit | 3dd3e8e24ac93f40f21ef281c25907dd12780e73 (patch) | |
| tree | b4e4089937c4e61b3e51a74add1d5f3564101bde | |
| parent | e008f89cfa1aa88204f720cac227a2c29bf57da4 (diff) | |
| download | ffmpeg-3dd3e8e24ac93f40f21ef281c25907dd12780e73.tar.gz | |
avcodec/omx: Fix handling of fragmented buffers
See https://trac.ffmpeg.org/ticket/7687
If an encoded frame is returned split over two or more
IL buffers due to the size, then there is a race between
whether get_buffer will fail, return NULL, and a truncated
frame is passed on, or IL will return the remaining part
of the encoded frame.
If get_buffer returns NULL, part of the frame is left behind
in the codec, and will be collected on the next call. That
then leaves a frame stuck in the codec. Repeat enough times
and the codec FIFO is full, and the pipeline stalls.
A performance improvement in the Raspberry Pi firmware means
that the timing has changed, and now frequently drops into the
case where get_buffer returns NULL.
Add code such that should a buffer be received without
OMX_BUFFERFLAG_ENDOFFRAME that get_buffer is called with wait
set, so we wait for the remainder of the frame.
This code has been made conditional on the Pi build in case
other IL implementations don't handle ENDOFFRAME correctly.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
Signed-off-by: Aman Gupta <aman@tmm1.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 3d857f219eb972fb345e784d17268e16b6dec6f0)
| -rw-r--r-- | libavcodec/omx.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/omx.c b/libavcodec/omx.c index 3128abd5ec..20869c0f44 100644 --- a/libavcodec/omx.c +++ b/libavcodec/omx.c @@ -735,6 +735,7 @@ static int omx_encode_frame(AVCodecContext *avctx, AVPacket *pkt, int ret = 0; OMX_BUFFERHEADERTYPE* buffer; OMX_ERRORTYPE err; + int had_partial = 0; if (frame) { uint8_t *dst[4]; @@ -826,7 +827,7 @@ static int omx_encode_frame(AVCodecContext *avctx, AVPacket *pkt, // packet, or get EOS. buffer = get_buffer(&s->output_mutex, &s->output_cond, &s->num_done_out_buffers, s->done_out_buffers, - !frame); + !frame || had_partial); if (!buffer) break; @@ -861,6 +862,9 @@ static int omx_encode_frame(AVCodecContext *avctx, AVPacket *pkt, s->output_buf = NULL; s->output_buf_size = 0; } +#if CONFIG_OMX_RPI + had_partial = 1; +#endif } else { // End of frame, and the caller provided a preallocated frame if ((ret = ff_alloc_packet2(avctx, pkt, s->output_buf_size + buffer->nFilledLen, 0)) < 0) { |