November 2020 - ffmpeg-cvslog

avcodec/vaapi_av1: read film grain param values from AV1Frames
by James Almer 30 Nov '20

30 Nov '20

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Mon Nov 30 13:42:31 2020 -0300| [052b4c3481b034a6187ad0900f1aa3c73016144e] | committer: James Almer avcodec/vaapi_av1: read film grain param values from AV1Frames Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=052b4c3481b034a61… --- libavcodec/vaapi_av1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vaapi_av1.c b/libavcodec/vaapi_av1.c index 21b3eceb91..2763c1e866 100644 --- a/libavcodec/vaapi_av1.c +++ b/libavcodec/vaapi_av1.c @@ -56,7 +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; + 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;

1 0

avcodec/dxva2_av1: read film grain param values from AV1Frames
by James Almer 30 Nov '20

30 Nov '20

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed Nov 25 17:53:23 2020 -0300| [6aa45a27698ae271dbcf6c41d9739bfd0938bb88] | committer: James Almer avcodec/dxva2_av1: read film grain param values from AV1Frames Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6aa45a27698ae271d… --- libavcodec/dxva2_av1.c | 63 +++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/libavcodec/dxva2_av1.c b/libavcodec/dxva2_av1.c index c6cbd48f5f..72c38f5d12 100644 --- a/libavcodec/dxva2_av1.c +++ b/libavcodec/dxva2_av1.c @@ -59,6 +59,7 @@ static int fill_picture_parameters(const AVCodecContext *avctx, AVDXVAContext *c int i,j, uses_lr; const AV1RawSequenceHeader *seq = h->raw_seq; const AV1RawFrameHeader *frame_header = h->raw_frame_header; + const AV1RawFilmGrainParams *film_grain = &h->cur_frame.film_grain; unsigned char remap_lr_type[4] = { AV1_RESTORE_NONE, AV1_RESTORE_SWITCHABLE, AV1_RESTORE_WIENER, AV1_RESTORE_SGRPROJ }; @@ -214,47 +215,47 @@ static int fill_picture_parameters(const AVCodecContext *avctx, AVDXVAContext *c } /* Film grain */ - if (frame_header->apply_grain) { + if (film_grain->apply_grain) { pp->film_grain.apply_grain = 1; - pp->film_grain.scaling_shift_minus8 = frame_header->grain_scaling_minus_8; - pp->film_grain.chroma_scaling_from_luma = frame_header->chroma_scaling_from_luma; - pp->film_grain.ar_coeff_lag = frame_header->ar_coeff_lag; - pp->film_grain.ar_coeff_shift_minus6 = frame_header->ar_coeff_shift_minus_6; - pp->film_grain.grain_scale_shift = frame_header->grain_scale_shift; - pp->film_grain.overlap_flag = frame_header->overlap_flag; - pp->film_grain.clip_to_restricted_range = frame_header->clip_to_restricted_range; + pp->film_grain.scaling_shift_minus8 = film_grain->grain_scaling_minus_8; + pp->film_grain.chroma_scaling_from_luma = film_grain->chroma_scaling_from_luma; + pp->film_grain.ar_coeff_lag = film_grain->ar_coeff_lag; + pp->film_grain.ar_coeff_shift_minus6 = film_grain->ar_coeff_shift_minus_6; + pp->film_grain.grain_scale_shift = film_grain->grain_scale_shift; + pp->film_grain.overlap_flag = film_grain->overlap_flag; + pp->film_grain.clip_to_restricted_range = film_grain->clip_to_restricted_range; pp->film_grain.matrix_coeff_is_identity = (seq->color_config.matrix_coefficients == AVCOL_SPC_RGB); - pp->film_grain.grain_seed = frame_header->grain_seed; - pp->film_grain.num_y_points = frame_header->num_y_points; - for (i = 0; i < frame_header->num_y_points; i++) { - pp->film_grain.scaling_points_y[i][0] = frame_header->point_y_value[i]; - pp->film_grain.scaling_points_y[i][1] = frame_header->point_y_scaling[i]; + pp->film_grain.grain_seed = film_grain->grain_seed; + pp->film_grain.num_y_points = film_grain->num_y_points; + for (i = 0; i < film_grain->num_y_points; i++) { + pp->film_grain.scaling_points_y[i][0] = film_grain->point_y_value[i]; + pp->film_grain.scaling_points_y[i][1] = film_grain->point_y_scaling[i]; } - pp->film_grain.num_cb_points = frame_header->num_cb_points; - for (i = 0; i < frame_header->num_cb_points; i++) { - pp->film_grain.scaling_points_cb[i][0] = frame_header->point_cb_value[i]; - pp->film_grain.scaling_points_cb[i][1] = frame_header->point_cb_scaling[i]; + pp->film_grain.num_cb_points = film_grain->num_cb_points; + for (i = 0; i < film_grain->num_cb_points; i++) { + pp->film_grain.scaling_points_cb[i][0] = film_grain->point_cb_value[i]; + pp->film_grain.scaling_points_cb[i][1] = film_grain->point_cb_scaling[i]; } - pp->film_grain.num_cr_points = frame_header->num_cr_points; - for (i = 0; i < frame_header->num_cr_points; i++) { - pp->film_grain.scaling_points_cr[i][0] = frame_header->point_cr_value[i]; - pp->film_grain.scaling_points_cr[i][1] = frame_header->point_cr_scaling[i]; + pp->film_grain.num_cr_points = film_grain->num_cr_points; + for (i = 0; i < film_grain->num_cr_points; i++) { + pp->film_grain.scaling_points_cr[i][0] = film_grain->point_cr_value[i]; + pp->film_grain.scaling_points_cr[i][1] = film_grain->point_cr_scaling[i]; } for (i = 0; i < 24; i++) { - pp->film_grain.ar_coeffs_y[i] = frame_header->ar_coeffs_y_plus_128[i]; + pp->film_grain.ar_coeffs_y[i] = film_grain->ar_coeffs_y_plus_128[i]; } for (i = 0; i < 25; i++) { - pp->film_grain.ar_coeffs_cb[i] = frame_header->ar_coeffs_cb_plus_128[i]; - pp->film_grain.ar_coeffs_cr[i] = frame_header->ar_coeffs_cr_plus_128[i]; + pp->film_grain.ar_coeffs_cb[i] = film_grain->ar_coeffs_cb_plus_128[i]; + pp->film_grain.ar_coeffs_cr[i] = film_grain->ar_coeffs_cr_plus_128[i]; } - pp->film_grain.cb_mult = frame_header->cb_mult; - pp->film_grain.cb_luma_mult = frame_header->cb_luma_mult; - pp->film_grain.cr_mult = frame_header->cr_mult; - pp->film_grain.cr_luma_mult = frame_header->cr_luma_mult; - pp->film_grain.cb_offset = frame_header->cb_offset; - pp->film_grain.cr_offset = frame_header->cr_offset; - pp->film_grain.cr_offset = frame_header->cr_offset; + pp->film_grain.cb_mult = film_grain->cb_mult; + pp->film_grain.cb_luma_mult = film_grain->cb_luma_mult; + pp->film_grain.cr_mult = film_grain->cr_mult; + pp->film_grain.cr_luma_mult = film_grain->cr_luma_mult; + pp->film_grain.cb_offset = film_grain->cb_offset; + pp->film_grain.cr_offset = film_grain->cr_offset; + pp->film_grain.cr_offset = film_grain->cr_offset; } // XXX: Setting the StatusReportFeedbackNumber breaks decoding on some drivers (tested on NVIDIA 457.09)

1 0

avcodec/nvdec_av1: read film grain param values from AV1Frames
by James Almer 30 Nov '20

30 Nov '20

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed Nov 25 17:05:33 2020 -0300| [003aeeb3f6216d98fa993fc830c1ce861955c99a] | committer: James Almer avcodec/nvdec_av1: read film grain param values from AV1Frames Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=003aeeb3f6216d98f… --- libavcodec/nvdec_av1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/nvdec_av1.c b/libavcodec/nvdec_av1.c index 1bac1fe26c..bd920d814a 100644 --- a/libavcodec/nvdec_av1.c +++ b/libavcodec/nvdec_av1.c @@ -42,7 +42,7 @@ static int nvdec_av1_start_frame(AVCodecContext *avctx, const uint8_t *buffer, u const 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; + const AV1RawFilmGrainParams *film_grain = &s->cur_frame.film_grain; NVDECContext *ctx = avctx->internal->hwaccel_priv_data; CUVIDPICPARAMS *pp = &ctx->pic_params;

1 0

avcodec/av1dec: infer and store film grain param values in AV1Frame
by James Almer 30 Nov '20

30 Nov '20

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed Nov 25 17:02:56 2020 -0300| [eee7ba8dba3546ce953f65b98f6ef59188ec935c] | committer: James Almer avcodec/av1dec: infer and store film grain param values in AV1Frame They are not always coded in the bistream for each frame. In some cases, the values need to be taken from a reference frame. See section 6.8.20 from the AV1 spec. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eee7ba8dba3546ce9… --- libavcodec/av1dec.c | 25 +++++++++++++++++++++++++ libavcodec/av1dec.h | 2 ++ 2 files changed, 27 insertions(+) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index ce051d4e6d..1589b8f0c0 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -247,6 +247,26 @@ static void coded_lossless_param(AV1DecContext *s) } } +static void load_grain_params(AV1DecContext *s) +{ + const AV1RawFrameHeader *header = s->raw_frame_header; + const AV1RawFilmGrainParams *film_grain = &header->film_grain, *src; + AV1RawFilmGrainParams *dst = &s->cur_frame.film_grain; + + if (!film_grain->apply_grain) + return; + + if (film_grain->update_grain) { + memcpy(dst, film_grain, sizeof(*dst)); + return; + } + + src = &s->ref[film_grain->film_grain_params_ref_idx].film_grain; + + memcpy(dst, src, sizeof(*dst)); + dst->grain_seed = film_grain->grain_seed; +} + static int init_tile_data(AV1DecContext *s) { @@ -447,6 +467,7 @@ static void av1_frame_unref(AVCodecContext *avctx, AV1Frame *f) f->spatial_id = f->temporal_id = 0; memset(f->skip_mode_frame_idx, 0, 2 * sizeof(uint8_t)); + memset(&f->film_grain, 0, sizeof(f->film_grain)); f->coded_lossless = 0; } @@ -482,6 +503,9 @@ static int av1_frame_ref(AVCodecContext *avctx, AV1Frame *dst, const AV1Frame *s memcpy(dst->skip_mode_frame_idx, src->skip_mode_frame_idx, 2 * sizeof(uint8_t)); + memcpy(&dst->film_grain, + &src->film_grain, + sizeof(dst->film_grain)); dst->coded_lossless = src->coded_lossless; return 0; @@ -762,6 +786,7 @@ static int get_current_frame(AVCodecContext *avctx) global_motion_params(s); skip_mode_params(s); coded_lossless_param(s); + load_grain_params(s); return ret; } diff --git a/libavcodec/av1dec.h b/libavcodec/av1dec.h index 4b218f64bb..7e3b0c7291 100644 --- a/libavcodec/av1dec.h +++ b/libavcodec/av1dec.h @@ -47,6 +47,8 @@ typedef struct AV1Frame { uint8_t skip_mode_frame_idx[2]; + AV1RawFilmGrainParams film_grain; + uint8_t coded_lossless; } AV1Frame;

1 0

avcodec/cbs_av1: split film grain param fields into their own struct
by James Almer 30 Nov '20

30 Nov '20

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed Nov 25 16:56:51 2020 -0300| [aea80e227327da2f275e9fb14821eac2b57df930] | committer: James Almer 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(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aea80e227327da2f2… --- libavcodec/cbs_av1.h | 62 +++++++++++++++++++----------------- libavcodec/cbs_av1_syntax_template.c | 9 +++--- libavcodec/nvdec_av1.c | 59 +++++++++++++++++----------------- libavcodec/vaapi_av1.c | 17 +++++----- 4 files changed, 77 insertions(+), 70 deletions(-) diff --git a/libavcodec/cbs_av1.h b/libavcodec/cbs_av1.h index 386774750a..799470015c 100644 --- a/libavcodec/cbs_av1.h +++ b/libavcodec/cbs_av1.h @@ -130,6 +130,38 @@ typedef struct AV1RawSequenceHeader { uint8_t film_grain_params_present; } AV1RawSequenceHeader; +typedef struct AV1RawFilmGrainParams { + uint8_t apply_grain; + uint16_t grain_seed; + uint8_t update_grain; + uint8_t film_grain_params_ref_idx; + uint8_t num_y_points; + uint8_t point_y_value[14]; + uint8_t point_y_scaling[14]; + uint8_t chroma_scaling_from_luma; + uint8_t num_cb_points; + uint8_t point_cb_value[10]; + uint8_t point_cb_scaling[10]; + uint8_t num_cr_points; + uint8_t point_cr_value[10]; + uint8_t point_cr_scaling[10]; + uint8_t grain_scaling_minus_8; + uint8_t ar_coeff_lag; + uint8_t ar_coeffs_y_plus_128[24]; + uint8_t ar_coeffs_cb_plus_128[25]; + uint8_t ar_coeffs_cr_plus_128[25]; + uint8_t ar_coeff_shift_minus_6; + uint8_t grain_scale_shift; + uint8_t cb_mult; + uint8_t cb_luma_mult; + uint16_t cb_offset; + uint8_t cr_mult; + uint8_t cr_luma_mult; + uint16_t cr_offset; + uint8_t overlap_flag; + uint8_t clip_to_restricted_range; +} AV1RawFilmGrainParams; + typedef struct AV1RawFrameHeader { uint8_t show_existing_frame; uint8_t frame_to_show_map_idx; @@ -251,35 +283,7 @@ typedef struct AV1RawFrameHeader { //AV1RawSubexp gm_params[AV1_TOTAL_REFS_PER_FRAME][6]; uint32_t gm_params[AV1_TOTAL_REFS_PER_FRAME][6]; - uint8_t apply_grain; - uint16_t grain_seed; - uint8_t update_grain; - uint8_t film_grain_params_ref_idx; - uint8_t num_y_points; - uint8_t point_y_value[14]; - uint8_t point_y_scaling[14]; - uint8_t chroma_scaling_from_luma; - uint8_t num_cb_points; - uint8_t point_cb_value[10]; - uint8_t point_cb_scaling[10]; - uint8_t num_cr_points; - uint8_t point_cr_value[10]; - uint8_t point_cr_scaling[10]; - uint8_t grain_scaling_minus_8; - uint8_t ar_coeff_lag; - uint8_t ar_coeffs_y_plus_128[24]; - uint8_t ar_coeffs_cb_plus_128[25]; - uint8_t ar_coeffs_cr_plus_128[25]; - uint8_t ar_coeff_shift_minus_6; - uint8_t grain_scale_shift; - uint8_t cb_mult; - uint8_t cb_luma_mult; - uint16_t cb_offset; - uint8_t cr_mult; - uint8_t cr_luma_mult; - uint16_t cr_offset; - uint8_t overlap_flag; - uint8_t clip_to_restricted_range; + AV1RawFilmGrainParams film_grain; } AV1RawFrameHeader; typedef struct AV1RawTileData { diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index f866dc7b2e..6fe6e9a4f3 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -1194,7 +1194,8 @@ static int FUNC(global_motion_params)(CodedBitstreamContext *ctx, RWContext *rw, } static int FUNC(film_grain_params)(CodedBitstreamContext *ctx, RWContext *rw, - AV1RawFrameHeader *current) + AV1RawFilmGrainParams *current, + AV1RawFrameHeader *frame_header) { CodedBitstreamAV1Context *priv = ctx->priv_data; const AV1RawSequenceHeader *seq = priv->sequence_header; @@ -1202,7 +1203,7 @@ static int FUNC(film_grain_params)(CodedBitstreamContext *ctx, RWContext *rw, int i, err; if (!seq->film_grain_params_present || - (!current->show_frame && !current->showable_frame)) + (!frame_header->show_frame && !frame_header->showable_frame)) return 0; flag(apply_grain); @@ -1212,7 +1213,7 @@ static int FUNC(film_grain_params)(CodedBitstreamContext *ctx, RWContext *rw, fb(16, grain_seed); - if (current->frame_type == AV1_FRAME_INTER) + if (frame_header->frame_type == AV1_FRAME_INTER) flag(update_grain); else infer(update_grain, 1); @@ -1635,7 +1636,7 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw, CHECK(FUNC(global_motion_params)(ctx, rw, current)); - CHECK(FUNC(film_grain_params)(ctx, rw, current)); + CHECK(FUNC(film_grain_params)(ctx, rw, &current->film_grain, current)); av_log(ctx->log_ctx, AV_LOG_DEBUG, "Frame %d: size %dx%d " "upscaled %d render %dx%d subsample %dx%d " diff --git a/libavcodec/nvdec_av1.c b/libavcodec/nvdec_av1.c index 9da1c840e3..1bac1fe26c 100644 --- a/libavcodec/nvdec_av1.c +++ b/libavcodec/nvdec_av1.c @@ -42,6 +42,7 @@ static int nvdec_av1_start_frame(AVCodecContext *avctx, const uint8_t *buffer, u const 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; NVDECContext *ctx = avctx->internal->hwaccel_priv_data; CUVIDPICPARAMS *pp = &ctx->pic_params; @@ -54,7 +55,7 @@ static int nvdec_av1_start_frame(AVCodecContext *avctx, const uint8_t *buffer, u int ret, i, j; - ret = ff_nvdec_start_frame_sep_ref(avctx, cur_frame, frame_header->apply_grain); + ret = ff_nvdec_start_frame_sep_ref(avctx, cur_frame, film_grain->apply_grain); if (ret < 0) return ret; @@ -181,24 +182,24 @@ static int nvdec_av1_start_frame(AVCodecContext *avctx, const uint8_t *buffer, u .spatial_layer_id = s->cur_frame.spatial_id, /* Film Grain Params */ - .apply_grain = frame_header->apply_grain, - .overlap_flag = frame_header->overlap_flag, - .scaling_shift_minus8 = frame_header->grain_scaling_minus_8, - .chroma_scaling_from_luma = frame_header->chroma_scaling_from_luma, - .ar_coeff_lag = frame_header->ar_coeff_lag, - .ar_coeff_shift_minus6 = frame_header->ar_coeff_shift_minus_6, - .grain_scale_shift = frame_header->grain_scale_shift, - .clip_to_restricted_range = frame_header->clip_to_restricted_range, - .num_y_points = frame_header->num_y_points, - .num_cb_points = frame_header->num_cb_points, - .num_cr_points = frame_header->num_cr_points, - .random_seed = frame_header->grain_seed, - .cb_mult = frame_header->cb_mult, - .cb_luma_mult = frame_header->cb_luma_mult, - .cb_offset = frame_header->cb_offset, - .cr_mult = frame_header->cr_mult, - .cr_luma_mult = frame_header->cr_luma_mult, - .cr_offset = frame_header->cr_offset + .apply_grain = film_grain->apply_grain, + .overlap_flag = film_grain->overlap_flag, + .scaling_shift_minus8 = film_grain->grain_scaling_minus_8, + .chroma_scaling_from_luma = film_grain->chroma_scaling_from_luma, + .ar_coeff_lag = film_grain->ar_coeff_lag, + .ar_coeff_shift_minus6 = film_grain->ar_coeff_shift_minus_6, + .grain_scale_shift = film_grain->grain_scale_shift, + .clip_to_restricted_range = film_grain->clip_to_restricted_range, + .num_y_points = film_grain->num_y_points, + .num_cb_points = film_grain->num_cb_points, + .num_cr_points = film_grain->num_cr_points, + .random_seed = film_grain->grain_seed, + .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 } }; @@ -258,23 +259,23 @@ static int nvdec_av1_start_frame(AVCodecContext *avctx, const uint8_t *buffer, u } /* Film Grain Params */ - if (frame_header->apply_grain) { + if (film_grain->apply_grain) { for (i = 0; i < 14; ++i) { - ppc->scaling_points_y[i][0] = frame_header->point_y_value[i]; - ppc->scaling_points_y[i][1] = frame_header->point_y_scaling[i]; + ppc->scaling_points_y[i][0] = film_grain->point_y_value[i]; + ppc->scaling_points_y[i][1] = film_grain->point_y_scaling[i]; } for (i = 0; i < 10; ++i) { - ppc->scaling_points_cb[i][0] = frame_header->point_cb_value[i]; - ppc->scaling_points_cb[i][1] = frame_header->point_cb_scaling[i]; - ppc->scaling_points_cr[i][0] = frame_header->point_cr_value[i]; - ppc->scaling_points_cr[i][1] = frame_header->point_cr_scaling[i]; + ppc->scaling_points_cb[i][0] = film_grain->point_cb_value[i]; + ppc->scaling_points_cb[i][1] = film_grain->point_cb_scaling[i]; + ppc->scaling_points_cr[i][0] = film_grain->point_cr_value[i]; + ppc->scaling_points_cr[i][1] = film_grain->point_cr_scaling[i]; } for (i = 0; i < 24; ++i) { - ppc->ar_coeffs_y[i] = (short)frame_header->ar_coeffs_y_plus_128[i] - 128; + ppc->ar_coeffs_y[i] = (short)film_grain->ar_coeffs_y_plus_128[i] - 128; } for (i = 0; i < 25; ++i) { - ppc->ar_coeffs_cb[i] = (short)frame_header->ar_coeffs_cb_plus_128[i] - 128; - ppc->ar_coeffs_cr[i] = (short)frame_header->ar_coeffs_cr_plus_128[i] - 128; + ppc->ar_coeffs_cb[i] = (short)film_grain->ar_coeffs_cb_plus_128[i] - 128; + ppc->ar_coeffs_cr[i] = (short)film_grain->ar_coeffs_cr_plus_128[i] - 128; } } 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,

1 0

Revert "avcodec/nvdec_av1: fix setting film grain parameters for frames with update_grain == 0"
by James Almer 30 Nov '20

30 Nov '20

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed Nov 25 16:29:34 2020 -0300| [e4c3ec3e00e77e7717a8d081d5e9e4289a44ca58] | committer: James Almer Revert "avcodec/nvdec_av1: fix setting film grain parameters for frames with update_grain == 0" This reverts commit f9eec6298387fe72cd8035ff45276cfc3da784a8. This does not effectively cover all cases. The values for some frames need to be inferred by the decoder. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e4c3ec3e00e77e771… --- libavcodec/nvdec_av1.c | 57 +++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 31 deletions(-) diff --git a/libavcodec/nvdec_av1.c b/libavcodec/nvdec_av1.c index f6267b1d96..9da1c840e3 100644 --- a/libavcodec/nvdec_av1.c +++ b/libavcodec/nvdec_av1.c @@ -41,7 +41,7 @@ static int nvdec_av1_start_frame(AVCodecContext *avctx, const uint8_t *buffer, u { const AV1DecContext *s = avctx->priv_data; const AV1RawSequenceHeader *seq = s->raw_seq; - const AV1RawFrameHeader *fg_header, *frame_header = s->raw_frame_header; + const AV1RawFrameHeader *frame_header = s->raw_frame_header; NVDECContext *ctx = avctx->internal->hwaccel_priv_data; CUVIDPICPARAMS *pp = &ctx->pic_params; @@ -58,11 +58,6 @@ static int nvdec_av1_start_frame(AVCodecContext *avctx, const uint8_t *buffer, u if (ret < 0) return ret; - if (frame_header->apply_grain && !frame_header->update_grain) - fg_header = s->ref[frame_header->film_grain_params_ref_idx].raw_frame_header; - else - fg_header = frame_header; - fdd = (FrameDecodeData*)cur_frame->private_ref->data; cf = (NVDECFrame*)fdd->hwaccel_priv; @@ -187,23 +182,23 @@ static int nvdec_av1_start_frame(AVCodecContext *avctx, const uint8_t *buffer, u /* Film Grain Params */ .apply_grain = frame_header->apply_grain, - .overlap_flag = fg_header->overlap_flag, - .scaling_shift_minus8 = fg_header->grain_scaling_minus_8, - .chroma_scaling_from_luma = fg_header->chroma_scaling_from_luma, - .ar_coeff_lag = fg_header->ar_coeff_lag, - .ar_coeff_shift_minus6 = fg_header->ar_coeff_shift_minus_6, - .grain_scale_shift = fg_header->grain_scale_shift, - .clip_to_restricted_range = fg_header->clip_to_restricted_range, - .num_y_points = fg_header->num_y_points, - .num_cb_points = fg_header->num_cb_points, - .num_cr_points = fg_header->num_cr_points, + .overlap_flag = frame_header->overlap_flag, + .scaling_shift_minus8 = frame_header->grain_scaling_minus_8, + .chroma_scaling_from_luma = frame_header->chroma_scaling_from_luma, + .ar_coeff_lag = frame_header->ar_coeff_lag, + .ar_coeff_shift_minus6 = frame_header->ar_coeff_shift_minus_6, + .grain_scale_shift = frame_header->grain_scale_shift, + .clip_to_restricted_range = frame_header->clip_to_restricted_range, + .num_y_points = frame_header->num_y_points, + .num_cb_points = frame_header->num_cb_points, + .num_cr_points = frame_header->num_cr_points, .random_seed = frame_header->grain_seed, - .cb_mult = fg_header->cb_mult, - .cb_luma_mult = fg_header->cb_luma_mult, - .cb_offset = fg_header->cb_offset, - .cr_mult = fg_header->cr_mult, - .cr_luma_mult = fg_header->cr_luma_mult, - .cr_offset = fg_header->cr_offset + .cb_mult = frame_header->cb_mult, + .cb_luma_mult = frame_header->cb_luma_mult, + .cb_offset = frame_header->cb_offset, + .cr_mult = frame_header->cr_mult, + .cr_luma_mult = frame_header->cr_luma_mult, + .cr_offset = frame_header->cr_offset } }; @@ -265,21 +260,21 @@ static int nvdec_av1_start_frame(AVCodecContext *avctx, const uint8_t *buffer, u /* Film Grain Params */ if (frame_header->apply_grain) { for (i = 0; i < 14; ++i) { - ppc->scaling_points_y[i][0] = fg_header->point_y_value[i]; - ppc->scaling_points_y[i][1] = fg_header->point_y_scaling[i]; + ppc->scaling_points_y[i][0] = frame_header->point_y_value[i]; + ppc->scaling_points_y[i][1] = frame_header->point_y_scaling[i]; } for (i = 0; i < 10; ++i) { - ppc->scaling_points_cb[i][0] = fg_header->point_cb_value[i]; - ppc->scaling_points_cb[i][1] = fg_header->point_cb_scaling[i]; - ppc->scaling_points_cr[i][0] = fg_header->point_cr_value[i]; - ppc->scaling_points_cr[i][1] = fg_header->point_cr_scaling[i]; + ppc->scaling_points_cb[i][0] = frame_header->point_cb_value[i]; + ppc->scaling_points_cb[i][1] = frame_header->point_cb_scaling[i]; + ppc->scaling_points_cr[i][0] = frame_header->point_cr_value[i]; + ppc->scaling_points_cr[i][1] = frame_header->point_cr_scaling[i]; } for (i = 0; i < 24; ++i) { - ppc->ar_coeffs_y[i] = (short)fg_header->ar_coeffs_y_plus_128[i] - 128; + ppc->ar_coeffs_y[i] = (short)frame_header->ar_coeffs_y_plus_128[i] - 128; } for (i = 0; i < 25; ++i) { - ppc->ar_coeffs_cb[i] = (short)fg_header->ar_coeffs_cb_plus_128[i] - 128; - ppc->ar_coeffs_cr[i] = (short)fg_header->ar_coeffs_cr_plus_128[i] - 128; + ppc->ar_coeffs_cb[i] = (short)frame_header->ar_coeffs_cb_plus_128[i] - 128; + ppc->ar_coeffs_cr[i] = (short)frame_header->ar_coeffs_cr_plus_128[i] - 128; } }

1 0

avfilter/af_agate: add support for commands and timeline
by Paul B Mahol 30 Nov '20

30 Nov '20

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Mon Nov 30 21:40:52 2020 +0100| [da83673c8b90e69a93d65856fcfa8b169e5c1452] | committer: Paul B Mahol avfilter/af_agate: add support for commands and timeline > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=da83673c8b90e69a9… --- doc/filters.texi | 8 ++++++++ libavfilter/af_agate.c | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index 06ed28f3f9..d2afc7115d 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -1478,6 +1478,10 @@ the reduction. Default is @code{average}. Can be @code{average} or @code{maximum}. @end table +@subsection Commands + +This filter supports the all above options as @ref{commands}. + @section aiir Apply an arbitrary Infinite Impulse Response filter. @@ -5081,6 +5085,10 @@ Default is average. Can be average or maximum. Set sidechain gain. Default is 1. Range is from 0.015625 to 64. @end table +@subsection Commands + +This filter supports the all above options as @ref{commands}. + @section silencedetect Detect silence in an audio stream. diff --git a/libavfilter/af_agate.c b/libavfilter/af_agate.c index 9efc6f9c40..5fcf6eceb1 100644 --- a/libavfilter/af_agate.c +++ b/libavfilter/af_agate.c @@ -63,7 +63,7 @@ typedef struct AudioGateContext { } AudioGateContext; #define OFFSET(x) offsetof(AudioGateContext, x) -#define A AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM +#define A AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_RUNTIME_PARAM static const AVOption options[] = { { "level_in", "set input level", OFFSET(level_in), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0.015625, 64, A }, @@ -268,6 +268,8 @@ AVFilter ff_af_agate = { .priv_class = &agate_class, .inputs = inputs, .outputs = outputs, + .process_command = ff_filter_process_command, + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; #endif /* CONFIG_AGATE_FILTER */ @@ -445,5 +447,7 @@ AVFilter ff_af_sidechaingate = { .uninit = uninit, .inputs = sidechaingate_inputs, .outputs = sidechaingate_outputs, + .process_command = ff_filter_process_command, + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; #endif /* CONFIG_SIDECHAINGATE_FILTER */

1 0

avfilter/af_acrossover: remove unneeded emms_c() calls
by Paul B Mahol 30 Nov '20

30 Nov '20

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Mon Nov 30 14:50:34 2020 +0100| [62a0368fb469277ccd6d9209ebdc39b03196eb59] | committer: Paul B Mahol avfilter/af_acrossover: remove unneeded emms_c() calls > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=62a0368fb469277cc… --- libavfilter/af_acrossover.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavfilter/af_acrossover.c b/libavfilter/af_acrossover.c index 6150af7933..74b60035d4 100644 --- a/libavfilter/af_acrossover.c +++ b/libavfilter/af_acrossover.c @@ -339,7 +339,6 @@ static int filter_channels_## name(AVFilterContext *ctx, void *arg, int jobnr, i \ s->fdsp->vector_## ff ##mul_scalar((type *)frames[0]->extended_data[ch], src, \ s->level_in, FFALIGN(nb_samples, sizeof(type))); \ - emms_c(); \ \ for (int band = 0; band < ctx->nb_outputs; band++) { \ for (int f = 0; band + 1 < ctx->nb_outputs && f < s->filter_count; f++) { \ @@ -387,7 +386,6 @@ static int filter_channels_## name(AVFilterContext *ctx, void *arg, int jobnr, i type *dst = (type *)frames[band]->extended_data[ch]; \ s->fdsp->vector_## ff ##mul_scalar(dst, dst, -one, \ FFALIGN(nb_samples, sizeof(type))); \ - emms_c(); \ } \ } \ } \

1 0

avfilter/af_acrossover: unroll biquad_process loop
by Paul B Mahol 30 Nov '20

30 Nov '20

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Mon Nov 30 14:20:45 2020 +0100| [ca0900bc6ef1db42881769528f2a3bb69e0bc492] | committer: Paul B Mahol avfilter/af_acrossover: unroll biquad_process loop Makes code significantly faster for higher orders. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ca0900bc6ef1db428… --- libavfilter/af_acrossover.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/libavfilter/af_acrossover.c b/libavfilter/af_acrossover.c index 7788251d3a..6150af7933 100644 --- a/libavfilter/af_acrossover.c +++ b/libavfilter/af_acrossover.c @@ -288,7 +288,25 @@ static void biquad_process_## name(const BiquadCoeffs *const c,\ type z1 = b->z1; \ type z2 = b->z2; \ \ - for (int n = 0; n < nb_samples; n++) { \ + for (int n = 0; n + 1 < nb_samples; n++) { \ + type in = src[n]; \ + type out; \ + \ + out = in * b0 + z1; \ + z1 = b1 * in + z2 + a1 * out; \ + z2 = b2 * in + a2 * out; \ + dst[n] = out; \ + \ + n++; \ + in = src[n]; \ + out = in * b0 + z1; \ + z1 = b1 * in + z2 + a1 * out; \ + z2 = b2 * in + a2 * out; \ + dst[n] = out; \ + } \ + \ + if (nb_samples & 1) { \ + const int n = nb_samples - 1; \ const type in = src[n]; \ type out; \ \

1 0

avfilter/af_acrossover: use fdsp for inverter
by Paul B Mahol 30 Nov '20

30 Nov '20

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Mon Nov 30 13:45:08 2020 +0100| [6100a01a7ad939d8069b011a29eb8db90aa68aba] | committer: Paul B Mahol avfilter/af_acrossover: use fdsp for inverter > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6100a01a7ad939d80… --- libavfilter/af_acrossover.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/af_acrossover.c b/libavfilter/af_acrossover.c index 9b4e79a653..7788251d3a 100644 --- a/libavfilter/af_acrossover.c +++ b/libavfilter/af_acrossover.c @@ -367,9 +367,9 @@ static int filter_channels_## name(AVFilterContext *ctx, void *arg, int jobnr, i for (int band = 0; band < ctx->nb_outputs && s->first_order; band++) { \ if (band & 1) { \ type *dst = (type *)frames[band]->extended_data[ch]; \ - \ - for (int n = 0; n < nb_samples; n++) \ - dst[n] *= -one; \ + s->fdsp->vector_## ff ##mul_scalar(dst, dst, -one, \ + FFALIGN(nb_samples, sizeof(type))); \ + emms_c(); \ } \ } \ } \

1 0