diff options
| author | James Almer <jamrial@gmail.com> | 2020-11-25 16:56:51 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2020-11-30 19:12:39 -0300 |
| commit | aea80e227327da2f275e9fb14821eac2b57df930 (patch) | |
| tree | 6e3908b08c1f4012164bb8a5a81a7fb4b92fb09b /libavcodec/vaapi_av1.c | |
| parent | e4c3ec3e00e77e7717a8d081d5e9e4289a44ca58 (diff) | |
| download | ffmpeg-aea80e227327da2f275e9fb14821eac2b57df930.tar.gz | |
avcodec/cbs_av1: split film grain param fields into their own struct
Cosmetic change in preparation for the following patches.
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/vaapi_av1.c')
| -rw-r--r-- | libavcodec/vaapi_av1.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libavcodec/vaapi_av1.c b/libavcodec/vaapi_av1.c index fcce86b7e5..21b3eceb91 100644 --- a/libavcodec/vaapi_av1.c +++ b/libavcodec/vaapi_av1.c @@ -56,6 +56,7 @@ static int vaapi_av1_start_frame(AVCodecContext *avctx, AV1DecContext *s = avctx->priv_data; const AV1RawSequenceHeader *seq = s->raw_seq; const AV1RawFrameHeader *frame_header = s->raw_frame_header; + const AV1RawFilmGrainParams *film_grain = &frame_header->film_grain; VAAPIDecodePicture *pic = s->cur_frame.hwaccel_picture_private; VADecPictureParameterBufferAV1 pic_param; int8_t bit_depth_idx; @@ -115,14 +116,14 @@ static int vaapi_av1_start_frame(AVCodecContext *avctx, .update_data = frame_header->segmentation_update_data, }, .film_grain_info.film_grain_info_fields.bits = { - .apply_grain = frame_header->apply_grain, - .chroma_scaling_from_luma = frame_header->chroma_scaling_from_luma, - .grain_scaling_minus_8 = frame_header->grain_scaling_minus_8, - .ar_coeff_lag = frame_header->ar_coeff_lag, - .ar_coeff_shift_minus_6 = frame_header->ar_coeff_shift_minus_6, - .grain_scale_shift = frame_header->grain_scale_shift, - .overlap_flag = frame_header->overlap_flag, - .clip_to_restricted_range = frame_header->clip_to_restricted_range, + .apply_grain = film_grain->apply_grain, + .chroma_scaling_from_luma = film_grain->chroma_scaling_from_luma, + .grain_scaling_minus_8 = film_grain->grain_scaling_minus_8, + .ar_coeff_lag = film_grain->ar_coeff_lag, + .ar_coeff_shift_minus_6 = film_grain->ar_coeff_shift_minus_6, + .grain_scale_shift = film_grain->grain_scale_shift, + .overlap_flag = film_grain->overlap_flag, + .clip_to_restricted_range = film_grain->clip_to_restricted_range, }, .pic_info_fields.bits = { .frame_type = frame_header->frame_type, |