[FFmpeg-devel] [PATCH 0/2] Minor avutil/film_grain_params tweaks

[FFmpeg-devel] [PATCH 0/2] Minor avutil/film_grain_params tweaks

[Leo Izen]

A few minor tweaks to libavutil/film_grain_params.c.

Leo Izen (2):
  avutil/film_grain_params: remove unused variables
  avutil/film_grain_params: remove do loop in CHECK macro

 libavutil/film_grain_params.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

-- 
2.44.0

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

[FFmpeg-devel] [PATCH 1/2] avutil/film_grain_params: remove unused variables

[Leo Izen]

These variables are never read from, so they trigger -Wunused-variables

Signed-off-by: Leo Izen <leo.izen@gmail.com>
---
 libavutil/film_grain_params.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/libavutil/film_grain_params.c b/libavutil/film_grain_params.c
index fff7252f2f..b3fa37f527 100644
--- a/libavutil/film_grain_params.c
+++ b/libavutil/film_grain_params.c
@@ -53,8 +53,6 @@ const AVFilmGrainParams *av_film_grain_params_select(const AVFrame *frame)
 {
     const AVFilmGrainParams *fgp, *best = NULL;
     const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format);
-    const AVFilmGrainAOMParams *aom;
-    const AVFilmGrainH274Params *h274;
     int bit_depth_luma, bit_depth_chroma;
     if (!desc)
         return NULL;
@@ -88,7 +86,6 @@ const AVFilmGrainParams *av_film_grain_params_select(const AVFrame *frame)
         case AV_FILM_GRAIN_PARAMS_NONE:
             continue;
         case AV_FILM_GRAIN_PARAMS_AV1:
-            aom = &fgp->codec.aom;
             /* AOM FGS needs an exact match for the chroma resolution */
             if (fgp->subsampling_x != desc->log2_chroma_w ||
                 fgp->subsampling_y != desc->log2_chroma_h)
-- 
2.44.0

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

[FFmpeg-devel] [PATCH 2/2] avutil/film_grain_params: remove do loop in CHECK macro

[Leo Izen]

The continue statement will break out of the do/while loop, not the
outer loop as intended. This is one (compound) statement anyway, so we
can remove the do/while entirely.

Signed-off-by: Leo Izen <leo.izen@gmail.com>
---
 libavutil/film_grain_params.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libavutil/film_grain_params.c b/libavutil/film_grain_params.c
index b3fa37f527..8f8dcee569 100644
--- a/libavutil/film_grain_params.c
+++ b/libavutil/film_grain_params.c
@@ -70,10 +70,8 @@ const AVFilmGrainParams *av_film_grain_params_select(const AVFrame *frame)
             continue;
 
 #define CHECK(a, b, unspec)                                     \
-    do {                                                        \
         if ((a) != (unspec) && (b) != (unspec) && (a) != (b))   \
-            continue;                                           \
-    } while (0)
+            continue
 
         CHECK(fgp->bit_depth_luma,   bit_depth_luma,         0);
         CHECK(fgp->bit_depth_chroma, bit_depth_chroma,       0);
-- 
2.44.0

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