Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/libdav1d: honor the requested skip_frame level
Date: Fri,  7 Jan 2022 11:21:34 -0300
Message-ID: <20220107142134.821-2-jamrial@gmail.com> (raw)
In-Reply-To: <20220107142134.821-1-jamrial@gmail.com>

This supports dropping non-intra, non-key, or all frames.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavcodec/libdav1d.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c
index 8e45f533cb..9252a2572d 100644
--- a/libavcodec/libdav1d.c
+++ b/libavcodec/libdav1d.c
@@ -299,6 +299,7 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
 #endif
     int res;
 
+redo:
     if (!data->sz) {
         AVPacket *const pkt = dav1d->pkt;
 
@@ -363,6 +364,14 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
 
     av_assert0(p->data[0] && p->allocator_data);
 
+    if ((c->skip_frame >= AVDISCARD_NONINTRA && (p->frame_hdr->frame_type != DAV1D_FRAME_TYPE_KEY &&
+                                                 p->frame_hdr->frame_type != DAV1D_FRAME_TYPE_INTRA)) ||
+        (c->skip_frame >= AVDISCARD_NONKEY   &&  p->frame_hdr->frame_type != DAV1D_FRAME_TYPE_KEY) ||
+         c->skip_frame >= AVDISCARD_ALL) {
+        dav1d_picture_unref(p);
+        goto redo;
+    }
+
     // This requires the custom allocator above
     frame->buf[0] = av_buffer_ref(p->allocator_data);
     if (!frame->buf[0]) {
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

  reply	other threads:[~2022-01-07 14:22 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-07 14:21 [FFmpeg-devel] [PATCH 1/2] avcodec/av1: " James Almer
2022-01-07 14:21 ` James Almer [this message]
2022-01-07 16:14   ` [FFmpeg-devel] [PATCH 2/2] avcodec/libdav1d: " Hendrik Leppkes
2022-01-07 17:21     ` James Almer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220107142134.821-2-jamrial@gmail.com \
    --to=jamrial@gmail.com \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git