avfilter/formats: Remove avfilter_make_format64_list()

[ffmpeg] / libavutil / film_grain_params.h

diff --git a/libavutil/film_grain_params.h b/libavutil/film_grain_params.h
index 6d61ebab66b6219e8ab8f898b2fb22692ecc54ea..7629e3a0412acb61be40f1d22f2577a2ef852046 100644 (file)
--- a/libavutil/film_grain_params.h
+++ b/libavutil/film_grain_params.h
@@ -54,8 +54,8 @@ typedef struct AVFilmGrainAOMParams {
      * If chroma_scaling_from_luma is set to 0, signals the chroma scaling
      * function parameters.
      */
-    int num_uv_points[2];
-    uint8_t uv_points[2][10][2 /* value, scaling */];
+    int num_uv_points[2 /* cb, cr */];
+    uint8_t uv_points[2 /* cb, cr */][10][2 /* value, scaling */];
 
     /**
      * Specifies the shift applied to the chroma components. For AV1, its within
@@ -64,20 +64,21 @@ typedef struct AVFilmGrainAOMParams {
     int scaling_shift;
 
     /**
-     * Specifies the auto-regression lag. The number of coefficients is given by
-     * 2*ar_coeff_lag(ar_coeff_lag - 1), with an extra one for the chroma.
+     * Specifies the auto-regression lag.
      */
     int ar_coeff_lag;
 
     /**
-     * Luma auto-regression coefficients.
+     * Luma auto-regression coefficients. The number of coefficients is given by
+     * 2 * ar_coeff_lag * (ar_coeff_lag + 1).
      */
     int8_t ar_coeffs_y[24];
 
     /**
-     * Chroma auto-regression coefficients.
+     * Chroma auto-regression coefficients. The number of coefficients is given by
+     * 2 * ar_coeff_lag * (ar_coeff_lag + 1) + !!num_y_points.
      */
-    int8_t ar_coeffs_uv[2][25];
+    int8_t ar_coeffs_uv[2 /* cb, cr */][25];
 
     /**
      * Specifies the range of the auto-regressive coefficients. Values of 6,
@@ -96,14 +97,14 @@ typedef struct AVFilmGrainAOMParams {
      * Specifies the luma/chroma multipliers for the index to the component
      * scaling function.
      */
-    int uv_mult[2];
-    int uv_mult_luma[2];
+    int uv_mult[2 /* cb, cr */];
+    int uv_mult_luma[2 /* cb, cr */];
 
     /**
      * Offset used for component scaling function. For AV1 its a 9-bit value
      * with a range [-256, 255]
      */
-    int uv_offset[2];
+    int uv_offset[2 /* cb, cr */];
 
     /**
      * Signals whether to overlap film grain blocks.