date:20100513

Re: [FFmpeg-soc] [PATCH] updated! vf_overlay alpha patch and watermarking using PNG with alpha

2010-05-13 Thread Baptiste Coudurier


Hi,

On 05/12/2010 02:33 PM, Michael Niedermayer wrote:

On Wed, May 12, 2010 at 09:00:46AM +0200, Vitor Sessak wrote:

Baptiste Coudurier wrote:

On 12/06/2009 08:12 AM, Vitor Sessak wrote:

Hi and sorry for the delay.

Artur Bodera wrote:

On Tue, Dec 1, 2009 at 12:50 AM, Vitor Sessak
wrote:


While I normally oppose making non-committed code more complex, I think
this feature is so often requested that it is worth the extra work in
the
future. Stefano, Michael, any strong opinion about this?



I think the vf_overlay should be modified altogether. Although
mathematically alpha-blending is more expensive than opaque pixel
replacement, I think that it should be automatically decided by
analyzing
the overlay format.

So the alpha-blending should be a "built-in" functionality (not a
switchable
parameter) and should be implicitly functional with any overlay
stream/image
that has alpha channel (i.e. rgba). If there is no alpha channel, then
pixel
overriding would be used. This makes much more sense.


I agree that this would be nice, but there is no way to make it work
with the current format negotiation in libavfilter. For example, there
is no way to have a filter that accepts either "input: rgb, output rgba"
or "input: yuv, output: yuva", so I suggest you just do as your present
patch for the time been.

How much harm does doing yuv ->  yuva or rgb ->  rgba in all cases ?
To my knowledge it would only be a matter of adding one component and
memset it to 0xff.


This wouldn't do much harm, but there is no way of asking for such kind of
inputs in lavfi (i.e., either "rgb,rgba" or "yuv,yuva"). And changing lavfi
to accept such constraints would probably make colospace negotiation a NP
problem.


finding a solution with a minimum of convertion could become NP, finding any
solution wont

heres a quick option (i do not know how good / bad this suggestion is,
if someone like loren could look at this before its implemented this
would probably be a good idea)

1. we extend query_format to query_format(int alternative) where alternative
selects which of several (small number normally and for most filters just 1)
alternative colorspace lists each link supports.
Euch such alternative is like the current case that is 2 links either must
have the same list of possible pixelformats/colorspaces or they are
independant.

2. we run the current avfiltergraph.c query_formats() over the graph skiping
all filters that have alternatives.

3. we go over all filters that have alternatives
for each such filter we find the 2 best alterantives, best based on
score= (A<<32) + B;
A= the number of scale filters the specific alterantive would require
B= the number of degrees of freedom lost (aka fewer colorspaces)
we then calculate a score2 that is the difference of the scores of
the best 2 alterantives.
And last lock in filter alterantives iteratively based on best score2

The idea here is that we lock in the filter with the most clearly supperior
alterantive first. That is if we have a filter that has 2 alterantives and
neither on its own would require an additional convertion filter and another
filter that also has 2 alternatives and one of these would require 1
convertion and the other case would require 2 convertions then the 1
convertion alternative would be locked in and we would restart from the begin

This is not optimal, not even for a simple linear filter chain with 2 filters.
But it might be an acceptable heuristic for real filter graphs.
For a single linear chain its possible to find the optimal case with
viterbi

Another method would be to only use avfiltergraph.c query_formats() and
consider all the alternative values inputs to it and the number of convertions
and degrees of freedom left over the whole graph its score. And then use some
generic optimization technique that minimizes this score.

btw, off topic a little but simply favoring the first colorspace in each
list like its done in svn is not a good idea, it likely would make more
sense to favor a colorspace that preserves all information that is there
and is simple. that is if either upstream or downstream is greyscale we
shouldnt select yuv similar issues exist with 16/8 bit and rgb/yuv and alpha



Question, why not using a pull paradigm from the output filter ?
That certainly gives an hint on what the user want at the end.
This would allow the overlay filter to request RGBA as input when output 
is RGB, same for YUVA/YUV


--
Baptiste COUDURIER
Key fingerprint 8D77134D20CC9220201FC5DB0AC9325C5C1ABAAA
FFmpeg maintainer  http://www.ffmpeg.org
___
FFmpeg-soc mailing list
FFmpeg-soc@mplayerhq.hu
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc

[FFmpeg-soc] [PATCH] align overlay picture w, h, x, y to pixel format

2010-05-13 Thread Baptiste Coudurier


Hi,

$subject.

Round up w/h of the overlay logo.

I'm not 100% sure of this.

--
Baptiste COUDURIER
Key fingerprint 8D77134D20CC9220201FC5DB0AC9325C5C1ABAAA
FFmpeg maintainer  http://www.ffmpeg.org
Index: vf_overlay.c
===
--- vf_overlay.c	(revision 5798)
+++ vf_overlay.c	(working copy)
@@ -348,6 +348,12 @@
 y = FFMIN(over->y, link->h-1);
 w = FFMIN(link->w-x, over->pics[1][0]->w);
 h = FFMIN(link->h-y, over->pics[1][0]->h);
+
+x &= ~((1 << over->hsub) - 1);
+y &= ~((1 << over->vsub) - 1);
+w = (w+((1>over->hsub;
+h = (h+((1>over->vsub;
+
 if(over->pics[1][0])
 copy_image(pic, x, y, over->pics[1][0], w, h,
over->bpp, over->hsub, over->vsub);
___
FFmpeg-soc mailing list
FFmpeg-soc@mplayerhq.hu
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc

[FFmpeg-soc] [soc]: r5798 - libavfilter/vf_overlay.c

2010-05-13 Thread bcoudurier

Author: bcoudurier
Date: Thu May 13 19:37:08 2010
New Revision: 5798

Log:
rgb path for overlay filter

Modified:
   libavfilter/vf_overlay.c

Modified: libavfilter/vf_overlay.c
==
--- libavfilter/vf_overlay.cThu May 13 19:34:36 2010(r5797)
+++ libavfilter/vf_overlay.cThu May 13 19:37:08 2010(r5798)
@@ -84,6 +84,8 @@ static av_cold void uninit(AVFilterConte
 
 static int query_formats(AVFilterContext *ctx)
 {
+  //const enum PixelFormat inout_pix_fmts[] = { PIX_FMT_BGR24, PIX_FMT_NONE };
+  //const enum PixelFormat blend_pix_fmts[] = { PIX_FMT_BGRA, PIX_FMT_NONE };
 const enum PixelFormat inout_pix_fmts[] = { PIX_FMT_YUV420P, PIX_FMT_NONE 
};
 const enum PixelFormat blend_pix_fmts[] = { PIX_FMT_YUVA420P, PIX_FMT_NONE 
};
 AVFilterFormats *inout_formats = avfilter_make_format_list(inout_pix_fmts);
@@ -199,6 +201,33 @@ static int lower_timestamp(OverlayContex
 return (over->pics[0][1]->pts > over->pics[1][1]->pts);
 }
 
+static void copy_image_rgb(AVFilterPicRef *dst, int x, int y,
+   AVFilterPicRef *src, int w, int h, int bpp)
+{
+AVPicture pic;
+
+memcpy(&pic, &dst->data, sizeof(AVPicture));
+pic.data[0] += x * bpp;
+pic.data[0] += y * pic.linesize[0];
+
+if (src->pic->format == PIX_FMT_BGRA) {
+for (y = 0; y < h; y++) {
+  uint8_t *optr = pic.data[0]  + y * pic.linesize[0];
+const uint8_t *iptr = src->data[0] + y * src->linesize[0];
+for (x = 0; x < w; x++) {
+uint8_t a = iptr[3];
+optr[0] = (optr[0] * (0xff - a) + iptr[0] * a + 128) >> 8;
+optr[1] = (optr[1] * (0xff - a) + iptr[1] * a + 128) >> 8;
+optr[2] = (optr[2] * (0xff - a) + iptr[2] * a + 128) >> 8;
+iptr += bpp+1;
+optr += bpp;
+}
+}
+} else {
+av_picture_copy(&pic, (AVPicture *)src->data, dst->pic->format, w, h);
+}
+}
+
 static void copy_blended(uint8_t* out, int out_linesize,
 const uint8_t* in, int in_linesize,
 const uint8_t* alpha, int alpha_linesize,
@@ -220,9 +249,9 @@ static void copy_blended(uint8_t* out, i
 }
 }
 
-static void copy_image(AVFilterPicRef *dst, int x, int y,
-   AVFilterPicRef *src, int w, int h,
-   int bpp, int hsub, int vsub)
+static void copy_image_yuv(AVFilterPicRef *dst, int x, int y,
+   AVFilterPicRef *src, int w, int h,
+   int bpp, int hsub, int vsub)
 {
 AVPicture pic;
 int i;
@@ -253,6 +282,16 @@ static void copy_image(AVFilterPicRef *d
 }
 }
 
+static void copy_image(AVFilterPicRef *dst, int x, int y,
+   AVFilterPicRef *src, int w, int h,
+   int bpp, int hsub, int vsub)
+{
+if (dst->pic->format == PIX_FMT_YUV420P)
+return copy_image_yuv(dst, x, y, src, w, h, bpp, hsub, vsub);
+else
+return copy_image_rgb(dst, x, y, src, w, h, bpp);
+}
+
 static int request_frame(AVFilterLink *link)
 {
 AVFilterPicRef *pic;
___
FFmpeg-soc mailing list
FFmpeg-soc@mplayerhq.hu
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc

[FFmpeg-soc] [soc]: r5797 - libavfilter/vf_overlay.c

2010-05-13 Thread bcoudurier

Author: bcoudurier
Date: Thu May 13 19:34:36 2010
New Revision: 5797

Log:
correct rounding when alpha blending

Modified:
   libavfilter/vf_overlay.c

Modified: libavfilter/vf_overlay.c
==
--- libavfilter/vf_overlay.cWed May 12 02:26:33 2010(r5796)
+++ libavfilter/vf_overlay.cThu May 13 19:34:36 2010(r5797)
@@ -212,7 +212,7 @@ static void copy_blended(uint8_t* out, i
 const uint8_t *aptr = alpha + (y<> 8;
+*optr = (*optr * (0xff - a) + *iptr * a + 128) >> 8;
 optr++;
 iptr++;
 aptr += 1 << hsub;
___
FFmpeg-soc mailing list
FFmpeg-soc@mplayerhq.hu
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc

Re: [FFmpeg-soc] [PATCH] updated! vf_overlay alpha patch and watermarking using PNG with alpha

[FFmpeg-soc] [PATCH] align overlay picture w, h, x, y to pixel format

[FFmpeg-soc] [soc]: r5798 - libavfilter/vf_overlay.c

[FFmpeg-soc] [soc]: r5797 - libavfilter/vf_overlay.c

4 matches

Site Navigation

Mail list logo

Footer information