picture: make the film grain metadata public

This becomes part of the picture properties, since users may want to
apply film grain themselves (e.g. for a GPU implementation).

1 files changed, 2 insertions, 21 deletions

diff --git a/src/levels.h b/src/levels.h
index db09c1f..4d1a24c 100644
--- a/src/levels.h
+++ b/src/levels.h
@@ -391,25 +391,6 @@ typedef struct Av1LoopfilterModeRefDeltas {
     int ref_delta[8];
 } Av1LoopfilterModeRefDeltas;
 
-typedef struct Av1FilmGrainData {
-    int num_y_points;
-    uint8_t y_points[14][2 /* value, scaling */];
-    int chroma_scaling_from_luma;
-    int num_uv_points[2];
-    uint8_t uv_points[2][10][2 /* value, scaling */];
-    int scaling_shift;
-    int ar_coeff_lag;
-    int8_t ar_coeffs_y[24];
-    int8_t ar_coeffs_uv[2][25];
-    int ar_coeff_shift;
-    int grain_scale_shift;
-    int8_t uv_mult[2];
-    int8_t uv_luma_mult[2];
-    int16_t uv_offset[2];
-    int overlap_flag;
-    int clip_to_restricted_range;
-} Av1FilmGrainData;
-
 typedef struct Av1FrameHeader {
     int show_existing_frame;
     int existing_frame_idx;
@@ -503,8 +484,8 @@ typedef struct Av1FrameHeader {
     int reduced_txtp_set;
     WarpedMotionParams gmv[7];
     struct {
-        int present, update, seed;
-        Av1FilmGrainData data;
+        int present, update;
+        Dav1dFilmGrainData data;
     } film_grain;
 } Av1FrameHeader;