AV1DecContext *s = avctx->priv_data;
const AV1RawSequenceHeader *seq = s->raw_seq;
const AV1RawFrameHeader *frame_header = s->raw_frame_header;
+ const AV1RawFilmGrainParams *film_grain = &s->cur_frame.film_grain;
VAAPIDecodePicture *pic = s->cur_frame.hwaccel_picture_private;
VADecPictureParameterBufferAV1 pic_param;
int8_t bit_depth_idx;
int err = 0;
+ int apply_grain = !(avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN) && film_grain->apply_grain;
uint8_t remap_lr_type[4] = {AV1_RESTORE_NONE, AV1_RESTORE_SWITCHABLE, AV1_RESTORE_WIENER, AV1_RESTORE_SGRPROJ};
pic->output_surface = vaapi_av1_surface_id(&s->cur_frame);
.subsampling_x = seq->color_config.subsampling_x,
.subsampling_y = seq->color_config.subsampling_y,
.chroma_sample_position = seq->color_config.chroma_sample_position,
- .film_grain_params_present = seq->film_grain_params_present,
+ .film_grain_params_present = seq->film_grain_params_present &&
+ !(avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN),
},
.seg_info.segment_info_fields.bits = {
.enabled = frame_header->segmentation_enabled,
.temporal_update = frame_header->segmentation_temporal_update,
.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,
+ .film_grain_info = {
+ .film_grain_info_fields.bits = {
+ .apply_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,
+ },
+ .grain_seed = film_grain->grain_seed,
+ .num_y_points = film_grain->num_y_points,
+ .num_cb_points = film_grain->num_cb_points,
+ .num_cr_points = film_grain->num_cr_points,
+ .cb_mult = film_grain->cb_mult,
+ .cb_luma_mult = film_grain->cb_luma_mult,
+ .cb_offset = film_grain->cb_offset,
+ .cr_mult = film_grain->cr_mult,
+ .cr_luma_mult = film_grain->cr_luma_mult,
+ .cr_offset = film_grain->cr_offset,
},
.pic_info_fields.bits = {
.frame_type = frame_header->frame_type,
for (int j = 0; j < 6; j++)
pic_param.wm[i - 1].wmmat[j] = s->cur_frame.gm_params[i][j];
}
+ if (apply_grain) {
+ for (int i = 0; i < film_grain->num_y_points; i++) {
+ pic_param.film_grain_info.point_y_value[i] =
+ film_grain->point_y_value[i];
+ pic_param.film_grain_info.point_y_scaling[i] =
+ film_grain->point_y_scaling[i];
+ }
+ for (int i = 0; i < film_grain->num_cb_points; i++) {
+ pic_param.film_grain_info.point_cb_value[i] =
+ film_grain->point_cb_value[i];
+ pic_param.film_grain_info.point_cb_scaling[i] =
+ film_grain->point_cb_scaling[i];
+ }
+ for (int i = 0; i < film_grain->num_cr_points; i++) {
+ pic_param.film_grain_info.point_cr_value[i] =
+ film_grain->point_cr_value[i];
+ pic_param.film_grain_info.point_cr_scaling[i] =
+ film_grain->point_cr_scaling[i];
+ }
+ for (int i = 0; i < 24; i++) {
+ pic_param.film_grain_info.ar_coeffs_y[i] =
+ film_grain->ar_coeffs_y_plus_128[i] - 128;
+ }
+ for (int i = 0; i < 25; i++) {
+ pic_param.film_grain_info.ar_coeffs_cb[i] =
+ film_grain->ar_coeffs_cb_plus_128[i] - 128;
+ pic_param.film_grain_info.ar_coeffs_cr[i] =
+ film_grain->ar_coeffs_cr_plus_128[i] - 128;
+ }
+ }
err = ff_vaapi_decode_make_param_buffer(avctx, pic,
VAPictureParameterBufferType,
&pic_param, sizeof(pic_param));