Re: [FFmpeg-devel] [PATCH] fix pad artifacting

[Ben Lu via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>]

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

Sure, looks like gmail is complying with a plaintext email RFC. Let me try
attaching to eml with:
`git format-patch -s -o "outputfolder" --add-header "X-Unsent: 1" --suffix
.eml --to ffmpeg-devel@ffmpeg.org -1 0f497eb391b`

On Mon, Feb 3, 2025 at 3:22 PM James Almer <jamrial@gmail.com> wrote:

> On 2/3/2025 10:58 AM, Ben Lu via ffmpeg-devel wrote:
> > Sorry about that, it looks correct in gmail and sending to myself also
> > looks fine, not sure where the line width corruption is happening. Our
> org
> > doesn't allow programmatic email.
>
> Looks like lines with a single blank space are being replaced by empty
> lines.
>
> >
> > Is it possible to use this gist?
>
> Try to attach the output of git format-patch to an email instead. That
> gist is only a diff of changes and missing all the git commit info.
>
> _______________________________________________
> 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".
>

[-- Attachment #2: 0001-fix-pad-artifacts.eml --]
[-- Type: message/rfc822, Size: 2305 bytes --]

From: Ben Lu <benlu@x.com>
To: ffmpeg-devel@ffmpeg.org
Subject: [PATCH] fix pad artifacts
Date: Fri, 31 Jan 2025 23:13:25 +0000

Signed-off-by: Ben Lu <benlu@x.com>
---
 libavfilter/vf_pad.c | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c
index 49fb272b24..846dd0a9f4 100644
--- a/libavfilter/vf_pad.c
+++ b/libavfilter/vf_pad.c
@@ -237,15 +237,24 @@ static AVFrame *get_video_buffer(AVFilterLink *inlink, int w, int h)
     if (s->inlink_w <= 0)
         return NULL;
 
-    frame = ff_get_video_buffer(inlink->dst->outputs[0],
-                                w + (s->w - s->in_w),
-                                h + (s->h - s->in_h) + (s->x > 0));
+    if (s->eval_mode == EVAL_MODE_FRAME) {
+        frame = ff_get_video_buffer(inlink->dst->outputs[0], s->w, s->h);
+    } else {
+        frame = ff_get_video_buffer(inlink->dst->outputs[0],
+                                    w + (s->w - s->in_w),
+                                    h + (s->h - s->in_h) + (s->x > 0));
+    }
 
     if (!frame)
         return NULL;
 
-    frame->width  = w;
-    frame->height = h;
+    if (s->eval_mode == EVAL_MODE_FRAME) {
+        frame->width  = s->w;
+        frame->height = s->h;
+    } else {
+        frame->width  = w;
+        frame->height = h;
+    }
 
     for (plane = 0; plane < 4 && frame->data[plane] && frame->linesize[plane]; plane++) {
         int hsub = s->draw.hsub[plane];
@@ -358,9 +367,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 
     if (needs_copy) {
         av_log(inlink->dst, AV_LOG_DEBUG, "Direct padding impossible allocating new frame\n");
-        out = ff_get_video_buffer(outlink,
-                                  FFMAX(inlink->w, s->w),
-                                  FFMAX(inlink->h, s->h));
+        if (s->eval_mode == EVAL_MODE_FRAME) {
+            out = ff_get_video_buffer(outlink, s->w, s->h);
+        } else {
+            out = ff_get_video_buffer(outlink,
+                                      FFMAX(inlink->w, s->w),
+                                      FFMAX(inlink->h, s->h));
+        }
         if (!out) {
             av_frame_free(&in);
             return AVERROR(ENOMEM);
-- 
2.35.1.70.gdb80f58b59-twtrsrc


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