Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
* [FFmpeg-devel] [PATCH 1/2] avcodec/av1: honor the requested skip_frame level
@ 2022-01-07 14:21 James Almer
  2022-01-07 14:21 ` [FFmpeg-devel] [PATCH 2/2] avcodec/libdav1d: " James Almer
  0 siblings, 1 reply; 4+ messages in thread
From: James Almer @ 2022-01-07 14:21 UTC (permalink / raw)
  To: ffmpeg-devel

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

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

diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c
index db110c50c7..94f65c6540 100644
--- a/libavcodec/av1dec.c
+++ b/libavcodec/av1dec.c
@@ -916,6 +916,12 @@ static int set_output_frame(AVCodecContext *avctx, AVFrame *frame,
         av_log2(s->operating_point_idc >> 8) > s->cur_frame.spatial_id)
         return 0;
 
+    if ((avctx->skip_frame >= AVDISCARD_NONINTRA && (s->raw_frame_header->frame_type != AV1_FRAME_KEY &&
+                                                     s->raw_frame_header->frame_type != AV1_FRAME_INTRA_ONLY)) ||
+        (avctx->skip_frame >= AVDISCARD_NONKEY   &&  s->raw_frame_header->frame_type != AV1_FRAME_KEY) ||
+         avctx->skip_frame >= AVDISCARD_ALL)
+        return 0;
+
     ret = av_frame_ref(frame, srcframe);
     if (ret < 0)
         return ret;
-- 
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".

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [FFmpeg-devel] [PATCH 2/2] avcodec/libdav1d: honor the requested skip_frame level
  2022-01-07 14:21 [FFmpeg-devel] [PATCH 1/2] avcodec/av1: honor the requested skip_frame level James Almer
@ 2022-01-07 14:21 ` James Almer
  2022-01-07 16:14   ` Hendrik Leppkes
  0 siblings, 1 reply; 4+ messages in thread
From: James Almer @ 2022-01-07 14:21 UTC (permalink / raw)
  To: ffmpeg-devel

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".

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [FFmpeg-devel] [PATCH 2/2] avcodec/libdav1d: honor the requested skip_frame level
  2022-01-07 14:21 ` [FFmpeg-devel] [PATCH 2/2] avcodec/libdav1d: " James Almer
@ 2022-01-07 16:14   ` Hendrik Leppkes
  2022-01-07 17:21     ` James Almer
  0 siblings, 1 reply; 4+ messages in thread
From: Hendrik Leppkes @ 2022-01-07 16:14 UTC (permalink / raw)
  To: FFmpeg development discussions and patches

On Fri, Jan 7, 2022 at 3:22 PM James Almer <jamrial@gmail.com> wrote:
>
> 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;
> +    }

Is skipping still meaningful if it doesn't actually speed up decoding?

- Hendrik
_______________________________________________
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".

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [FFmpeg-devel] [PATCH 2/2] avcodec/libdav1d: honor the requested skip_frame level
  2022-01-07 16:14   ` Hendrik Leppkes
@ 2022-01-07 17:21     ` James Almer
  0 siblings, 0 replies; 4+ messages in thread
From: James Almer @ 2022-01-07 17:21 UTC (permalink / raw)
  To: ffmpeg-devel

On 1/7/2022 1:14 PM, Hendrik Leppkes wrote:
> On Fri, Jan 7, 2022 at 3:22 PM James Almer <jamrial@gmail.com> wrote:
>>
>> 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;
>> +    }
> 
> Is skipping still meaningful if it doesn't actually speed up decoding?

Outputting only I frames, but that's also possible using a filter, i guess.

In any case, no alternative for libdav1d unless the actual library adds 
support for this, so I'll drop this patch.

> 
> - Hendrik
> _______________________________________________
> 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".

_______________________________________________
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".

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-01-07 17:22 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-07 14:21 [FFmpeg-devel] [PATCH 1/2] avcodec/av1: honor the requested skip_frame level James Almer
2022-01-07 14:21 ` [FFmpeg-devel] [PATCH 2/2] avcodec/libdav1d: " James Almer
2022-01-07 16:14   ` Hendrik Leppkes
2022-01-07 17:21     ` James Almer

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