From patchwork Mon Nov 23 11:38:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendrik Leppkes X-Patchwork-Id: 23972 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D20A344909F for ; Mon, 23 Nov 2020 13:45:30 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A588F68BB6B; Mon, 23 Nov 2020 13:45:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0AEFB68B2AB for ; Mon, 23 Nov 2020 13:45:24 +0200 (EET) Received: by mail-ed1-f53.google.com with SMTP id k1so3809901eds.13 for ; Mon, 23 Nov 2020 03:45:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wBvefkP3CQiP2E4YPnKxBZfFo8KZK4bFEdSwShdLZ1w=; b=sRRS322hQ0p0WTcggafOUmg+LAtQbupEb2BcvqEG6VECPE1WS37GnSoYZ2ZI54W1cv xoB2hX0tKPuB/QjkmA8TU2TTZCpH6UpypuEUhdinAs0Ip9oFMss0BBjii1uf+8kgNIBd KMQIxKNA8bQQmVmoGxHucK0tCub08dpbKIBkvk+1CTp1zRElcU7gLKVF+iRLwNcB7/Rc ld2lSmCGyye4z3v0ujit6WVYOoNznfO+qt9PAaRTyK7F1sVRHujfksmb/DVk6rti12mC DSHpU2Ui/AAg1TKr4LgXGuSSsgchElCQwI9sBjxHIO+q1yXxqNlV6LWQgfgw+P0RVrED +Ung== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wBvefkP3CQiP2E4YPnKxBZfFo8KZK4bFEdSwShdLZ1w=; b=GjiJqu/e0FAj15XNpzrTPKNUsOm/ODYJhO5qzdzrpgUlQr1VGWv1KLEtBms1apNeTa DeMcHkUFWovdvIt3VpFk7o/V93u0M/oZG9J05Dq8pOel2WX+yLUX4FEY43lx+J9gROot DIw95xWCaIc3mAzMYDKL1IO5rpKTtBYKxq6dK5G9uEX3xKlUneETO1nE5m6j5fv8p8Jp E4DzIT+QTpCQwx3hjelURJ9l/Q06QyIvu789ajCOwMK5VmDO/bsR62vd8+s/nIUMxJi6 qi4oZ41Eg/qT46nM5SJNaN34BMWWPvEA38efkDbBruDEASF1FOs0leaWussGpvzxv/bR qy/w== X-Gm-Message-State: AOAM5305spAhyS1tWJnyoC47o1BNV2qVlq9X5ctV9DDyMFR1EQBlNSyk kVw7f+JG0v2rJwWZGEhJ/3Uhrz/O3kx1DQ== X-Google-Smtp-Source: ABdhPJwX1qKWeScUDGxngDns1ycoD8Nh3zjbKDSkW0S6cafDLE6lU6Kj8L6uG/kEj/iFtYdSJXzR0Q== X-Received: by 2002:a17:906:4705:: with SMTP id y5mr42847338ejq.112.1606131495589; Mon, 23 Nov 2020 03:38:15 -0800 (PST) Received: from localhost.localdomain ([2a02:8108:44bf:b382:d521:4223:583:bd65]) by smtp.gmail.com with ESMTPSA id u7sm4131955ejt.33.2020.11.23.03.38.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 03:38:14 -0800 (PST) From: Hendrik Leppkes To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Nov 2020 12:38:05 +0100 Message-Id: <20201123113805.386-1-h.leppkes@gmail.com> X-Mailer: git-send-email 2.29.2.windows.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/dxva2_av1: use correct grain parameters with update_grain = 0 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Hendrik Leppkes Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" When update_grain is zero, the parameters should be taken from a reference frame instead. --- libavcodec/dxva2_av1.c | 59 +++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/libavcodec/dxva2_av1.c b/libavcodec/dxva2_av1.c index c6cbd48f5f..35d0bdf319 100644 --- a/libavcodec/dxva2_av1.c +++ b/libavcodec/dxva2_av1.c @@ -215,46 +215,47 @@ static int fill_picture_parameters(const AVCodecContext *avctx, AVDXVAContext *c /* Film grain */ if (frame_header->apply_grain) { + const AV1RawFrameHeader *fg_header = frame_header->update_grain ? frame_header : h->ref[frame_header->film_grain_params_ref_idx].raw_frame_header; 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 = fg_header->grain_scaling_minus_8; + pp->film_grain.chroma_scaling_from_luma = fg_header->chroma_scaling_from_luma; + pp->film_grain.ar_coeff_lag = fg_header->ar_coeff_lag; + pp->film_grain.ar_coeff_shift_minus6 = fg_header->ar_coeff_shift_minus_6; + pp->film_grain.grain_scale_shift = fg_header->grain_scale_shift; + pp->film_grain.overlap_flag = fg_header->overlap_flag; + pp->film_grain.clip_to_restricted_range = fg_header->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.num_y_points = fg_header->num_y_points; + for (i = 0; i < fg_header->num_y_points; i++) { + pp->film_grain.scaling_points_y[i][0] = fg_header->point_y_value[i]; + pp->film_grain.scaling_points_y[i][1] = fg_header->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 = fg_header->num_cb_points; + for (i = 0; i < fg_header->num_cb_points; i++) { + pp->film_grain.scaling_points_cb[i][0] = fg_header->point_cb_value[i]; + pp->film_grain.scaling_points_cb[i][1] = fg_header->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 = fg_header->num_cr_points; + for (i = 0; i < fg_header->num_cr_points; i++) { + pp->film_grain.scaling_points_cr[i][0] = fg_header->point_cr_value[i]; + pp->film_grain.scaling_points_cr[i][1] = fg_header->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] = fg_header->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] = fg_header->ar_coeffs_cb_plus_128[i]; + pp->film_grain.ar_coeffs_cr[i] = fg_header->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 = fg_header->cb_mult; + pp->film_grain.cb_luma_mult = fg_header->cb_luma_mult; + pp->film_grain.cr_mult = fg_header->cr_mult; + pp->film_grain.cr_luma_mult = fg_header->cr_luma_mult; + pp->film_grain.cb_offset = fg_header->cb_offset; + pp->film_grain.cr_offset = fg_header->cr_offset; + pp->film_grain.cr_offset = fg_header->cr_offset; } // XXX: Setting the StatusReportFeedbackNumber breaks decoding on some drivers (tested on NVIDIA 457.09)