Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Ethan Halsall <ethanshalsall-at-gmail.com@ffmpeg.org>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH] add yuv444p support to mcdeint
Date: Sat, 7 Jun 2025 12:15:06 -0500
Message-ID: <4faf47d3-54f4-4bfd-9695-0e5a03d8fe2f@gmail.com> (raw)
In-Reply-To: <20250602183927.GE29660@pb2>

[-- Attachment #1: Type: text/plain, Size: 6558 bytes --]

Hi Michael,

Apologies for the late response, I missed this message.

On 6/2/25 1:39 PM, Michael Niedermayer wrote:
> Hi Ethan
> 
> On Fri, May 30, 2025 at 12:29:19AM -0500, Ethan Halsall wrote:
>> On 5/29/25 7:58 PM, Michael Niedermayer wrote:
>>> On Tue, May 27, 2025 at 01:24:57PM -0500, Ethan Halsall wrote:
>>>> Signed-off-by: Ethan Halsall <ethanhalsall11@augustana.edu>
>>>> ---
>>>>   libavfilter/vf_mcdeint.c | 32 ++++++++++++++++++++++++++++----
>>>>   1 file changed, 28 insertions(+), 4 deletions(-)
>>>
>>> Applying: add yuv444p support to mcdeint
>>> error: corrupt patch at line 18
>>>
>>> this patch is somehow corrupted, that above is not a valid diff
>>> make sure the output of git format-patch is not modified
>>>
>>> thx
>>>
>>> [...]
>>
>> I followed the instructions on the "Sending patches from email clients"
>> section of https://ffmpeg.org/developer.html#Submitting-patches-1. I think
>> Thunderbird removed some line breaks in the patch though when I opened the
>> .eml file.
>>
>> Let's try this one:
>>
>>
>> Signed-off-by: Ethan Halsall <ethanhalsall11@augustana.edu>
>> ---
>>  libavfilter/vf_mcdeint.c | 32 ++++++++++++++++++++++++++++----
>>  1 file changed, 28 insertions(+), 4 deletions(-)
>>
>> diff --git a/libavfilter/vf_mcdeint.c b/libavfilter/vf_mcdeint.c
>> index 82048b51d0..11ad19f5cd 100644
>> --- a/libavfilter/vf_mcdeint.c
>> +++ b/libavfilter/vf_mcdeint.c
>> @@ -51,8 +51,10 @@
>>
>>  #include "libavutil/opt.h"
>>  #include "libavcodec/avcodec.h"
>> +#include "libavutil/pixdesc.h"
>>  #include "avfilter.h"
>>  #include "filters.h"
>> +#include "formats.h"
>>  #include "video.h"
>>
>>  enum MCDeintMode {
>> @@ -76,6 +78,7 @@ typedef struct MCDeintContext {
>>      AVPacket *pkt;
>>      AVFrame *frame_dec;
>>      AVCodecContext *enc_ctx;
>> +    const AVPixFmtDescriptor *pix_fmt_desc;
>>  } MCDeintContext;
>>
>>  #define OFFSET(x) offsetof(MCDeintContext, x)
> 
>> @@ -99,6 +102,17 @@ static const AVOption mcdeint_options[] = {
>>
>>  AVFILTER_DEFINE_CLASS(mcdeint);
>>
>> +static const enum AVPixelFormat pix_fmts[] = {
>> +    AV_PIX_FMT_YUV420P,
>> +    AV_PIX_FMT_YUV444P,
>> +    AV_PIX_FMT_NONE
>> +};
>> +
>> +static int query_formats(AVFilterContext *ctx)
>> +{
>> +    return ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
>> +}
> 
> why not use FILTER_PIXFMTS ?
> 
> 
>> +
>>  static int config_props(AVFilterLink *inlink)
>>  {
>>      AVFilterContext *ctx = inlink->dst;
>> @@ -122,13 +136,16 @@ static int config_props(AVFilterLink *inlink)
>>      mcdeint->enc_ctx = avcodec_alloc_context3(enc);
>>      if (!mcdeint->enc_ctx)
>>          return AVERROR(ENOMEM);
>> +    mcdeint->pix_fmt_desc = av_pix_fmt_desc_get(inlink->format);
>> +    if (!mcdeint->pix_fmt_desc)
>> +        return AVERROR(ENOMEM);
>>      enc_ctx = mcdeint->enc_ctx;
>>      enc_ctx->width  = inlink->w;
>>      enc_ctx->height = inlink->h;
>>      enc_ctx->time_base = (AVRational){1,25};  // meaningless
>>      enc_ctx->gop_size = INT_MAX;
>>      enc_ctx->max_b_frames = 0;
>> -    enc_ctx->pix_fmt = AV_PIX_FMT_YUV420P;
>> +    enc_ctx->pix_fmt = inlink->format;
>>      enc_ctx->flags = AV_CODEC_FLAG_QSCALE | AV_CODEC_FLAG_LOW_DELAY |
>> AV_CODEC_FLAG_RECON_FRAME;
>>      enc_ctx->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
>>      enc_ctx->global_quality = 1;
>> @@ -201,8 +218,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame
>> *inpic)
>>
>>      for (i = 0; i < 3; i++) {
>>          int is_chroma = !!i;
>> -        int w = AV_CEIL_RSHIFT(inlink->w, is_chroma);
>> -        int h = AV_CEIL_RSHIFT(inlink->h, is_chroma);
>> +        int w, h;
>> +        if (is_chroma) {
>> +            w = inlink->w >> mcdeint->pix_fmt_desc->log2_chroma_w;
>> +            h = inlink->h >> mcdeint->pix_fmt_desc->log2_chroma_h;
>> +        } else {
>> +            w = inlink->w;
>> +            h = inlink->h;
>> +        }
>>          int fils = frame_dec->linesize[i];
>>          int srcs = inpic    ->linesize[i];
>>          int dsts = outpic   ->linesize[i];
> 
> pix_fmt_desc could be a local variable in filter_frame()
> which would avoid adding it to the context
> 
> 
> thx
> 
> [...]
> 

Here is the patch updated with your suggestions (also attached):


Signed-off-by: Ethan Halsall <ethanhalsall11@augustana.edu>
---
 libavfilter/vf_mcdeint.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/libavfilter/vf_mcdeint.c b/libavfilter/vf_mcdeint.c
index 82048b51d0..33df331e08 100644
--- a/libavfilter/vf_mcdeint.c
+++ b/libavfilter/vf_mcdeint.c
@@ -51,6 +51,7 @@
 
 #include "libavutil/opt.h"
 #include "libavcodec/avcodec.h"
+#include "libavutil/pixdesc.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "video.h"
@@ -128,7 +129,7 @@ static int config_props(AVFilterLink *inlink)
     enc_ctx->time_base = (AVRational){1,25};  // meaningless
     enc_ctx->gop_size = INT_MAX;
     enc_ctx->max_b_frames = 0;
-    enc_ctx->pix_fmt = AV_PIX_FMT_YUV420P;
+    enc_ctx->pix_fmt = inlink->format;
     enc_ctx->flags = AV_CODEC_FLAG_QSCALE | AV_CODEC_FLAG_LOW_DELAY | AV_CODEC_FLAG_RECON_FRAME;
     enc_ctx->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
     enc_ctx->global_quality = 1;
@@ -172,6 +173,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpic)
     AVFilterLink *outlink = inlink->dst->outputs[0];
     AVFrame *outpic, *frame_dec = mcdeint->frame_dec;
     AVPacket *pkt = mcdeint->pkt;
+    const AVPixFmtDescriptor *pix_fmt_desc = av_pix_fmt_desc_get(inlink->format);
     int x, y, i, ret;
 
     outpic = ff_get_video_buffer(outlink, outlink->w, outlink->h);
@@ -201,8 +203,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpic)
 
     for (i = 0; i < 3; i++) {
         int is_chroma = !!i;
-        int w = AV_CEIL_RSHIFT(inlink->w, is_chroma);
-        int h = AV_CEIL_RSHIFT(inlink->h, is_chroma);
+        int w, h;
+        if (is_chroma) {
+            w = inlink->w >> pix_fmt_desc->log2_chroma_w;
+            h = inlink->h >> pix_fmt_desc->log2_chroma_h;
+        } else {
+            w = inlink->w;
+            h = inlink->h;
+        }
         int fils = frame_dec->linesize[i];
         int srcs = inpic    ->linesize[i];
         int dsts = outpic   ->linesize[i];
@@ -307,5 +315,5 @@ const FFFilter ff_vf_mcdeint = {
     .uninit        = uninit,
     FILTER_INPUTS(mcdeint_inputs),
     FILTER_OUTPUTS(ff_video_default_filterpad),
-    FILTER_SINGLE_PIXFMT(AV_PIX_FMT_YUV420P),
+    FILTER_PIXFMTS(AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV444P)
 };
-- 
2.43.0


Ethan

[-- Attachment #2: 0001-add-yuv444p-support-to-mcdeint.patch --]
[-- Type: text/x-patch, Size: 2518 bytes --]

From ffc42f0db5232c5d43c5e67e37b33a22136c44bc Mon Sep 17 00:00:00 2001
From: Ethan Halsall <ethanhalsall11@augustana.edu>
Date: Sun, 25 May 2025 00:51:05 -0500
Subject: [PATCH] add yuv444p support to mcdeint

Signed-off-by: Ethan Halsall <ethanhalsall11@augustana.edu>
---
 libavfilter/vf_mcdeint.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/libavfilter/vf_mcdeint.c b/libavfilter/vf_mcdeint.c
index 82048b51d0..33df331e08 100644
--- a/libavfilter/vf_mcdeint.c
+++ b/libavfilter/vf_mcdeint.c
@@ -51,6 +51,7 @@
 
 #include "libavutil/opt.h"
 #include "libavcodec/avcodec.h"
+#include "libavutil/pixdesc.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "video.h"
@@ -128,7 +129,7 @@ static int config_props(AVFilterLink *inlink)
     enc_ctx->time_base = (AVRational){1,25};  // meaningless
     enc_ctx->gop_size = INT_MAX;
     enc_ctx->max_b_frames = 0;
-    enc_ctx->pix_fmt = AV_PIX_FMT_YUV420P;
+    enc_ctx->pix_fmt = inlink->format;
     enc_ctx->flags = AV_CODEC_FLAG_QSCALE | AV_CODEC_FLAG_LOW_DELAY | AV_CODEC_FLAG_RECON_FRAME;
     enc_ctx->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
     enc_ctx->global_quality = 1;
@@ -172,6 +173,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpic)
     AVFilterLink *outlink = inlink->dst->outputs[0];
     AVFrame *outpic, *frame_dec = mcdeint->frame_dec;
     AVPacket *pkt = mcdeint->pkt;
+    const AVPixFmtDescriptor *pix_fmt_desc = av_pix_fmt_desc_get(inlink->format);
     int x, y, i, ret;
 
     outpic = ff_get_video_buffer(outlink, outlink->w, outlink->h);
@@ -201,8 +203,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpic)
 
     for (i = 0; i < 3; i++) {
         int is_chroma = !!i;
-        int w = AV_CEIL_RSHIFT(inlink->w, is_chroma);
-        int h = AV_CEIL_RSHIFT(inlink->h, is_chroma);
+        int w, h;
+        if (is_chroma) {
+            w = inlink->w >> pix_fmt_desc->log2_chroma_w;
+            h = inlink->h >> pix_fmt_desc->log2_chroma_h;
+        } else {
+            w = inlink->w;
+            h = inlink->h;
+        }
         int fils = frame_dec->linesize[i];
         int srcs = inpic    ->linesize[i];
         int dsts = outpic   ->linesize[i];
@@ -307,5 +315,5 @@ const FFFilter ff_vf_mcdeint = {
     .uninit        = uninit,
     FILTER_INPUTS(mcdeint_inputs),
     FILTER_OUTPUTS(ff_video_default_filterpad),
-    FILTER_SINGLE_PIXFMT(AV_PIX_FMT_YUV420P),
+    FILTER_PIXFMTS(AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV444P)
 };
-- 
2.43.0


[-- Attachment #3: Type: text/plain, Size: 251 bytes --]

_______________________________________________
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:[~2025-06-07 17:15 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-27 18:24 Ethan Halsall
2025-05-30  0:58 ` Michael Niedermayer
2025-05-30  5:29   ` Ethan Halsall
2025-06-02 18:39     ` Michael Niedermayer
2025-06-07 17:15       ` Ethan Halsall [this message]
2025-06-07 23:25         ` Michael Niedermayer
2025-06-08  6:07           ` Ethan Halsall
2025-06-14 20:52             ` Michael Niedermayer
2025-06-02 23:27     ` Ethan Halsall

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=4faf47d3-54f4-4bfd-9695-0e5a03d8fe2f@gmail.com \
    --to=ethanshalsall-at-gmail.com@ffmpeg.org \
    --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