[FFmpeg-cvslog] lavfi/unsharp: use the same macros used in the original MP filter

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala at poste.it> | Sat Aug 13 00:44:08 2011 +0200| [7ac3ccc5f238960cdf9e9c525c638d9f724031aa] | committer: Stefano Sabatini

lavfi/unsharp: use the same macros used in the original MP filter

Remove possibly pointless inconsistency with the ported code.

Also specify parameter value ranges consistent with those of the ported
filter.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ac3ccc5f238960cdf9e9c525c638d9f724031aa
---

 doc/filters.texi         |    8 ++++----
 libavfilter/vf_unsharp.c |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index ed55204..841d904 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -4925,11 +4925,11 @@ equivalent of the string '5:5:1.0:5:5:0.0'.
 
 @item luma_msize_x
 Set the luma matrix horizontal size. It can be an integer between 3
-and 13, default value is 5.
+and 63, default value is 5.
 
 @item luma_msize_y
 Set the luma matrix vertical size. It can be an integer between 3
-and 13, default value is 5.
+and 63, default value is 5.
 
 @item luma_amount
 Set the luma effect strength. It can be a float number between -2.0
@@ -4937,11 +4937,11 @@ and 5.0, default value is 1.0.
 
 @item chroma_msize_x
 Set the chroma matrix horizontal size. It can be an integer between 3
-and 13, default value is 5.
+and 63, default value is 5.
 
 @item chroma_msize_y
 Set the chroma matrix vertical size. It can be an integer between 3
-and 13, default value is 5.
+and 63, default value is 5.
 
 @item chroma_amount
 Set the chroma effect strength. It can be a float number between -2.0
diff --git a/libavfilter/vf_unsharp.c b/libavfilter/vf_unsharp.c
index 3a9b0b6..3949687 100644
--- a/libavfilter/vf_unsharp.c
+++ b/libavfilter/vf_unsharp.c
@@ -44,8 +44,8 @@
 #include "libavutil/mem.h"
 #include "libavutil/pixdesc.h"
 
-#define MIN_SIZE 3
-#define MAX_SIZE 13
+#define MIN_MATRIX_SIZE 3
+#define MAX_MATRIX_SIZE 63
 
 /* right-shift and round-up */
 #define SHIFTUP(x,shift) (-((-(x))>>(shift)))
@@ -58,7 +58,7 @@ typedef struct FilterParam {
     int steps_y;                             ///< vertical step count
     int scalebits;                           ///< bits to shift pixel
     int32_t halfscale;                       ///< amount to add to pixel
-    uint32_t *sc[(MAX_SIZE * MAX_SIZE) - 1]; ///< finite state machine storage
+    uint32_t *sc[MAX_MATRIX_SIZE - 1];       ///< finite state machine storage
 } FilterParam;
 
 typedef struct {
@@ -72,7 +72,7 @@ static void apply_unsharp(      uint8_t *dst, int dst_stride,
                           int width, int height, FilterParam *fp)
 {
     uint32_t **sc = fp->sc;
-    uint32_t sr[(MAX_SIZE * MAX_SIZE) - 1], tmp1, tmp2;
+    uint32_t sr[MAX_MATRIX_SIZE - 1], tmp1, tmp2;
 
     int32_t res;
     int x, y, z;