diff options
| author | James Almer <jamrial@gmail.com> | 2020-11-25 20:28:42 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2020-12-16 13:34:11 -0300 |
| commit | 1a8e719f36f09a4e85db4d3e37c546adecd31fee (patch) | |
| tree | b27df928fecb7b9fa7381c73c499e63688335ac1 /libavcodec/vaapi_av1.c | |
| parent | 32586a42da8c9dedd30c6e4c0417c9da91c1f283 (diff) | |
| download | ffmpeg-1a8e719f36f09a4e85db4d3e37c546adecd31fee.tar.gz | |
avcodec/av1dec: support exporting Film Grain params as frame side data
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/vaapi_av1.c')
| -rw-r--r-- | libavcodec/vaapi_av1.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/vaapi_av1.c b/libavcodec/vaapi_av1.c index b76e217daa..1809b485aa 100644 --- a/libavcodec/vaapi_av1.c +++ b/libavcodec/vaapi_av1.c @@ -61,6 +61,7 @@ static int vaapi_av1_start_frame(AVCodecContext *avctx, 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); @@ -107,7 +108,8 @@ static int vaapi_av1_start_frame(AVCodecContext *avctx, .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, @@ -117,7 +119,7 @@ static int vaapi_av1_start_frame(AVCodecContext *avctx, }, .film_grain_info = { .film_grain_info_fields.bits = { - .apply_grain = film_grain->apply_grain, + .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, @@ -215,7 +217,7 @@ static int vaapi_av1_start_frame(AVCodecContext *avctx, for (int j = 0; j < 6; j++) pic_param.wm[i - 1].wmmat[j] = s->cur_frame.gm_params[i][j]; } - if (film_grain->apply_grain) { + 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]; |