Browse Source

avcodec/v4l2_m2m_enc: buffer frame if it cannot be enqueued

Currently if the frame buffers are full, the frame is unrefed and
dropped.  Instead buffer the frame so that it is enqueued in the
next v4l2_receive_packet() call.  The behavior was observed on
DragonBoard 410c.

Signed-off-by: Andriy Gelman <andriy.gelman@gmail.com>
tags/n4.4
Andriy Gelman 5 years ago
parent
commit
8bc7f69cef
2 changed files with 7 additions and 2 deletions
  1. +1
    -0
      libavcodec/v4l2_m2m.c
  2. +6
    -2
      libavcodec/v4l2_m2m_enc.c

+ 1
- 0
libavcodec/v4l2_m2m.c View File

@@ -329,6 +329,7 @@ static void v4l2_m2m_destroy_context(void *opaque, uint8_t *context)
sem_destroy(&s->refsync);

close(s->fd);
av_frame_unref(s->frame);
av_frame_free(&s->frame);
av_packet_unref(&s->buf_pkt);



+ 6
- 2
libavcodec/v4l2_m2m_enc.c View File

@@ -295,16 +295,20 @@ static int v4l2_receive_packet(AVCodecContext *avctx, AVPacket *avpkt)
if (s->draining)
goto dequeue;

if (!frame->buf[0]) {
ret = ff_encode_get_frame(avctx, frame);
if (ret < 0 && ret != AVERROR_EOF)
return ret;

if (ret == AVERROR_EOF)
frame = NULL;
}

ret = v4l2_send_frame(avctx, frame);
av_frame_unref(frame);
if (ret < 0)
if (ret != AVERROR(EAGAIN))
av_frame_unref(frame);

if (ret < 0 && ret != AVERROR(EAGAIN))
return ret;

if (!output->streamon) {


Loading…
Cancel
Save