Re: [FFmpeg-devel] [PATCH] avfilter: add zoneplate video source filter

2023-05-10 Thread Paul B Mahol
On Wed, May 10, 2023 at 2:50 PM Michael Koch 
wrote:

> Well, I can't see how it looks now, but the sequence white - gray -
> white (which is impossible in a sine wave) should no longer be there,
> because cos(x) = cos(-x).
>

This is not caused by sin() but because video is full range yuv but
interpreted as limited.
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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


Re: [FFmpeg-devel] [PATCH] avfilter: add zoneplate video source filter

2023-05-10 Thread Michael Koch
Well, I can't see how it looks now, but the sequence white - gray - 
white (which is impossible in a sine wave) should no longer be there, 
because cos(x) = cos(-x).

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

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


Re: [FFmpeg-devel] [PATCH] avfilter: add zoneplate video source filter

2023-05-10 Thread Paul B Mahol
On Wed, May 10, 2023 at 2:32 PM Michael Koch 
wrote:

> ffmpeg -f lavfi -i zoneplate=kx2=320:ky2=240,format=gray -frames 1 -y
> out.png
>
> When you draw a line through the center, you have
> black - gray - white - gray - white - gray -black
> which means the sine wave changes its sign in the center.
> That's why zoneplates are normally calculated with cos() function.
> See also: https://en.wikipedia.org/wiki/Zone_plate#Continuous_zone_plates


I replaced sinf with cosf, and output is same, just different phase.
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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


Re: [FFmpeg-devel] [PATCH] avfilter: add zoneplate video source filter

2023-05-10 Thread Michael Koch
ffmpeg -f lavfi -i zoneplate=kx2=320:ky2=240,format=gray -frames 1 -y 
out.png


When you draw a line through the center, you have
black - gray - white - gray - white - gray -black
which means the sine wave changes its sign in the center.
That's why zoneplates are normally calculated with cos() function.
See also: https://en.wikipedia.org/wiki/Zone_plate#Continuous_zone_plates

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

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


Re: [FFmpeg-devel] [PATCH] avfilter: add zoneplate video source filter

2023-05-10 Thread Paul B Mahol
On Wed, May 10, 2023 at 1:58 PM Michael Koch 
wrote:

> Isn't it better to use cos() instead of sin()? With sin() there is a
> discontinuity in the center.
>

Where you see discontinuity in the filter output?
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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


Re: [FFmpeg-devel] [PATCH] avfilter: add zoneplate video source filter

2023-05-10 Thread Michael Koch
Isn't it better to use cos() instead of sin()? With sin() there is a 
discontinuity in the center.

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

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


Re: [FFmpeg-devel] [PATCH] avfilter: add zoneplate video source filter

2023-05-08 Thread Stefano Sabatini
On date Monday 2023-05-08 01:30:34 +0200, Paul B Mahol wrote:
> New version, faster and with slice threading and docs.

> From 8b9ab6e3401d69f115b5d331fec73fd8c01ea1bd Mon Sep 17 00:00:00 2001
> From: Paul B Mahol 
> Date: Sat, 6 May 2023 22:52:47 +0200
> Subject: [PATCH] avfilter: add zoneplate video test source
> 
> Signed-off-by: Paul B Mahol 
> ---
>  doc/filters.texi   |  96 +++
>  libavfilter/Makefile   |   1 +
>  libavfilter/allfilters.c   |   1 +
>  libavfilter/vsrc_testsrc.c | 157 +
>  4 files changed, 255 insertions(+)

missing Changelog entry?

> diff --git a/doc/filters.texi b/doc/filters.texi
> index 8b443c24e9..d7c828d119 100644
> --- a/doc/filters.texi
> +++ b/doc/filters.texi
> @@ -28080,6 +28080,102 @@ Set max jump for single pan destination. Allowed 
> range is from 1 to 1.
>  Set fractal type, can be default @code{carpet} or @code{triangle}.
>  @end table
>  
> +@section zoneplate
> +Generates a zoneplate test video pattern.

Nit: impersonal form (Generate) for the first sentence.

> +Numerous options for signal controls output phase in all three axis.

This source accepts ...

> +
> +This source accepts the following options:
> +
> +@table @option
> +@item size, s
> +Set frame size. For the syntax of this option, check the @ref{video size 
> syntax,,"Video
> +size" section in the ffmpeg-utils manual,ffmpeg-utils}. Default value is 
> "320x240".
> +
> +@item rate, r
> +Set frame rate, expressed as number of frames per second. Default
> +value is "25".
> +
> +@item duration, d
> +Set the duration of the sourced video. See
> +@ref{time duration syntax,,the Time duration section in the ffmpeg-utils(1) 
> manual,ffmpeg-utils}
> +for the accepted syntax.
> +
> +If not specified, or the expressed duration is negative, the video is
> +supposed to be generated forever.
> +
> +@item sar
> +Set the sample aspect ratio of the sourced video.
> +
> +@item precision
> +Set precision in bits for look-up table for sine calculations. Default value 
> is 10.
> +Allowed range is from 4 to 16.
> +
> +@item xo
> +Set horizontal axis offset for output signal. Default value is 0.
> +
> +@item yo
> +Set vertical axis offset for output signal. Default value is 0.
> +
> +@item k0
> +Set 0-order, constant added to signal phase. Default value is 0.
> +
> +@item kx
> +Set 1-order, phase factor multiplier for horizontal axis. Default value is 0.
> +
> +@item ky
> +Set 1-order, phase factor multiplier for vertical axis. Default value is 0.
> +
> +@item kt
> +Set 1-order, phase factor multiplier for time axis. Default value is 0.
> +
> +@item kxt, kyt, kxy
> +Set phase factor multipliers for combination of spatial and temporal axis.
> +Default value is 0.
> +
> +@item kx2
> +Set 2-order, phase factor multiplier for horizontal axis. Default value is 0.
> +
> +@item ky2
> +Set 2-order, phase factor multiplier for vertical axis. Default value is 0.
> +
> +@item kt2
> +Set 2-order, phase factor multiplier for time axis. Default value is 0.
> +
> +@item ku
> +Set the constant added to final phase to produce chroma-blue component of 
> signal.
> +Default value is 0.
> +
> +@item kv
> +Set the constant added to final phase to produce chroma-red component of 
> signal.
> +Default value is 0.
> +@end table
> +
> +@subsection Commands
> +

> +Filter supports the some above options as @ref{commands}.

Nit: This source supports the above options as ...

> +
> +@subsection Examples
> +
> +@itemize
> +@item
> +Generate horizontal color sine sweep:
> +@example
> +zoneplate=ku=512:kv=0:kt2=0:kx2=256:s=wvga:xo=-426:kt=11
> +@end example
> +
> +@item
> +Generate vertical color sine sweep:
> +@example
> +zoneplate=ku=512:kv=0:kt2=0:ky2=156:s=wvga:yo=-240:kt=11
> +@end example
> +
> +@item
> +Generate circular zone-plate:
> +@example
> +zoneplate=ku=512:kv=100:kt2=0:ky2=256:kx2=556:s=wvga:yo=0:kt=11
> +@end example
> +@end itemize
> +
>  @c man end VIDEO SOURCES
>  
>  @chapter Video Sinks
> diff --git a/libavfilter/Makefile b/libavfilter/Makefile
> index 93c614eeb7..9fb9a1095f 100644
> --- a/libavfilter/Makefile
> +++ b/libavfilter/Makefile
> @@ -598,6 +598,7 @@ OBJS-$(CONFIG_SMPTEHDBARS_FILTER)+= 
> vsrc_testsrc.o
>  OBJS-$(CONFIG_TESTSRC_FILTER)+= vsrc_testsrc.o
>  OBJS-$(CONFIG_TESTSRC2_FILTER)   += vsrc_testsrc.o
>  OBJS-$(CONFIG_YUVTESTSRC_FILTER) += vsrc_testsrc.o
> +OBJS-$(CONFIG_ZONEPLATE_FILTER)  += vsrc_testsrc.o
>  
>  OBJS-$(CONFIG_NULLSINK_FILTER)   += vsink_nullsink.o
>  
> diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
> index 1c0bc12a92..025966dc45 100644
> --- a/libavfilter/allfilters.c
> +++ b/libavfilter/allfilters.c
> @@ -563,6 +563,7 @@ extern const AVFilter ff_vsrc_smptehdbars;
>  extern const AVFilter ff_vsrc_testsrc;
>  extern const AVFilter ff_vsrc_testsrc2;
>  extern const AVFilter ff_vsrc_yuvtestsrc;
> +extern const AVFilter ff_vsrc_zoneplate;
>  

Re: [FFmpeg-devel] [PATCH] avfilter: add zoneplate video source filter

2023-05-07 Thread Paul B Mahol
New version, faster and with slice threading and docs.
From 8b9ab6e3401d69f115b5d331fec73fd8c01ea1bd Mon Sep 17 00:00:00 2001
From: Paul B Mahol 
Date: Sat, 6 May 2023 22:52:47 +0200
Subject: [PATCH] avfilter: add zoneplate video test source

Signed-off-by: Paul B Mahol 
---
 doc/filters.texi   |  96 +++
 libavfilter/Makefile   |   1 +
 libavfilter/allfilters.c   |   1 +
 libavfilter/vsrc_testsrc.c | 157 +
 4 files changed, 255 insertions(+)

diff --git a/doc/filters.texi b/doc/filters.texi
index 8b443c24e9..d7c828d119 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -28080,6 +28080,102 @@ Set max jump for single pan destination. Allowed range is from 1 to 1.
 Set fractal type, can be default @code{carpet} or @code{triangle}.
 @end table
 
+@section zoneplate
+Generates a zoneplate test video pattern.
+Numerous options for signal controls output phase in all three axis.
+
+This source accepts the following options:
+
+@table @option
+@item size, s
+Set frame size. For the syntax of this option, check the @ref{video size syntax,,"Video
+size" section in the ffmpeg-utils manual,ffmpeg-utils}. Default value is "320x240".
+
+@item rate, r
+Set frame rate, expressed as number of frames per second. Default
+value is "25".
+
+@item duration, d
+Set the duration of the sourced video. See
+@ref{time duration syntax,,the Time duration section in the ffmpeg-utils(1) manual,ffmpeg-utils}
+for the accepted syntax.
+
+If not specified, or the expressed duration is negative, the video is
+supposed to be generated forever.
+
+@item sar
+Set the sample aspect ratio of the sourced video.
+
+@item precision
+Set precision in bits for look-up table for sine calculations. Default value is 10.
+Allowed range is from 4 to 16.
+
+@item xo
+Set horizontal axis offset for output signal. Default value is 0.
+
+@item yo
+Set vertical axis offset for output signal. Default value is 0.
+
+@item k0
+Set 0-order, constant added to signal phase. Default value is 0.
+
+@item kx
+Set 1-order, phase factor multiplier for horizontal axis. Default value is 0.
+
+@item ky
+Set 1-order, phase factor multiplier for vertical axis. Default value is 0.
+
+@item kt
+Set 1-order, phase factor multiplier for time axis. Default value is 0.
+
+@item kxt, kyt, kxy
+Set phase factor multipliers for combination of spatial and temporal axis.
+Default value is 0.
+
+@item kx2
+Set 2-order, phase factor multiplier for horizontal axis. Default value is 0.
+
+@item ky2
+Set 2-order, phase factor multiplier for vertical axis. Default value is 0.
+
+@item kt2
+Set 2-order, phase factor multiplier for time axis. Default value is 0.
+
+@item ku
+Set the constant added to final phase to produce chroma-blue component of signal.
+Default value is 0.
+
+@item kv
+Set the constant added to final phase to produce chroma-red component of signal.
+Default value is 0.
+@end table
+
+@subsection Commands
+
+Filter supports the some above options as @ref{commands}.
+
+@subsection Examples
+
+@itemize
+@item
+Generate horizontal color sine sweep:
+@example
+zoneplate=ku=512:kv=0:kt2=0:kx2=256:s=wvga:xo=-426:kt=11
+@end example
+
+@item
+Generate vertical color sine sweep:
+@example
+zoneplate=ku=512:kv=0:kt2=0:ky2=156:s=wvga:yo=-240:kt=11
+@end example
+
+@item
+Generate circular zone-plate:
+@example
+zoneplate=ku=512:kv=100:kt2=0:ky2=256:kx2=556:s=wvga:yo=0:kt=11
+@end example
+@end itemize
+
 @c man end VIDEO SOURCES
 
 @chapter Video Sinks
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 93c614eeb7..9fb9a1095f 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -598,6 +598,7 @@ OBJS-$(CONFIG_SMPTEHDBARS_FILTER)+= vsrc_testsrc.o
 OBJS-$(CONFIG_TESTSRC_FILTER)+= vsrc_testsrc.o
 OBJS-$(CONFIG_TESTSRC2_FILTER)   += vsrc_testsrc.o
 OBJS-$(CONFIG_YUVTESTSRC_FILTER) += vsrc_testsrc.o
+OBJS-$(CONFIG_ZONEPLATE_FILTER)  += vsrc_testsrc.o
 
 OBJS-$(CONFIG_NULLSINK_FILTER)   += vsink_nullsink.o
 
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
index 1c0bc12a92..025966dc45 100644
--- a/libavfilter/allfilters.c
+++ b/libavfilter/allfilters.c
@@ -563,6 +563,7 @@ extern const AVFilter ff_vsrc_smptehdbars;
 extern const AVFilter ff_vsrc_testsrc;
 extern const AVFilter ff_vsrc_testsrc2;
 extern const AVFilter ff_vsrc_yuvtestsrc;
+extern const AVFilter ff_vsrc_zoneplate;
 
 extern const AVFilter ff_vsink_nullsink;
 
diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c
index f391ac02e0..1e74a0e42e 100644
--- a/libavfilter/vsrc_testsrc.c
+++ b/libavfilter/vsrc_testsrc.c
@@ -88,6 +88,14 @@ typedef struct TestSourceContext {
 
 /* only used by haldclut */
 int level;
+
+/* only used by zoneplate */
+int k0, kx, ky, kt;
+int kxt, kyt, kxy;
+int kx2, ky2, kt2;
+int xo, yo, kU, kV;
+int lut_precision;
+uint8_t *lut;
 } TestSourceContext;
 
 #define 

Re: [FFmpeg-devel] [PATCH] avfilter: add zoneplate video source filter

2023-05-07 Thread Stefano Sabatini
On date Sunday 2023-05-07 18:04:37 +0200, Paul B Mahol wrote:
> Attached.

> From 7b0a8586adc0a142f0b7afcdbdf36ce526f4cd34 Mon Sep 17 00:00:00 2001
> From: Paul B Mahol 
> Date: Sat, 6 May 2023 22:52:47 +0200
> Subject: [PATCH] avfilter: add zoneplate video test source
> 
> Signed-off-by: Paul B Mahol 
> ---
>  libavfilter/Makefile   |   1 +
>  libavfilter/allfilters.c   |   1 +
>  libavfilter/vsrc_testsrc.c | 142 +
>  3 files changed, 144 insertions(+)

please add docs

[...]
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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