From patchwork Thu Feb 29 05:58:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: llyyr X-Patchwork-Id: 49166 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp877167vqf; Thu, 23 May 2024 01:25:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW09d+kYmSFZ0jsQ7+CEXXsuPtQl309RcLHcYKjbHSkr0+DGpnRLM4ZFR+exeOzYyJiruaYpwyZeH4x1BQMvjlewGQFPz0+joZUPg== X-Google-Smtp-Source: AGHT+IGl+O9NXbFbdtaAme5WHKOlTWrgZbptGrzLlCwLh6DUhNYWI2EWWALpQIQiS7wnjL9XeWWj X-Received: by 2002:a17:906:1cda:b0:a5a:1871:e2a1 with SMTP id a640c23a62f3a-a622809e705mr278853666b.33.1716452711330; Thu, 23 May 2024 01:25:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716452711; cv=none; d=google.com; s=arc-20160816; b=O8KFHTW1rgP6bH6nGm7yo0GdyplONra5ZJqxS/mkUEnVaCGPtFpnlxKgCFyZnFPN/M xCJx0G8LPREp8JCzo4K6c6yccnW+N1uR55Fve9zkN7JWymkUsfiONNdArh0BcX11SoMZ jbGm6QQAIK90l+e2JK9f2IF2tKZTUz+kNEDgtAEouB3JQQR/GVFTU65w3ENvynLDArhR x6xAaR+b8WXTIARQuMB2HuHbFAN9CkyYjU22DpSlt00mGi0kalkf9+77+GK1QnE2x0xx 3dt3Wp84ePd+Kyppzrz8fgLeWd/VaQKqIJ0Ld7UVWhYwc5GOQhts3PBlXIZF+zHTVoyD 8dkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:date:to:message-id:from:dkim-signature :delivered-to; bh=6+pzZZLp7TBchzX2rgOfmXHcFLEtiTqgNyGzRYs1NqY=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=g902wLHO0QfZ5fYMnXNLxmI+cO4+PcOd1uV2T2OkCA62Nzxa2EADxrZZeVfw3yXmm6 nUyifAv9YWgMNq9OHv+ZAbykLMLujcZLGylzpIL9UJJ1Ol74lGB9f2OJKdaBeedq95mx Qk90NlpHBSIed7Qj2YnjM6KajtG1eKcQKrIvZAYKs27POzZPZvRUoQW4M7btalEcPM5N rXPNGqgqmdhCZcA1Mr95B9P6CRffwzYv1uuTLrDbs3R4fgZDrXQgTltva2fnE3B2Y9IL Rr3MZuPSSmPijDeEN2qk9sWoJuOlhTuz/rp3HdtABRI71XYJCDD3xJOaUKW3jQRhYPYN f72Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=DE3q9iZz; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a5cdeeeee72si846389766b.946.2024.05.23.01.25.10; Thu, 23 May 2024 01:25:11 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=DE3q9iZz; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0F5A868D3CA; Thu, 23 May 2024 11:25:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E542168AA84 for ; Thu, 23 May 2024 11:25:01 +0300 (EEST) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-6f472d550cbso3001281b3a.1 for ; Thu, 23 May 2024 01:25:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716452699; x=1717057499; darn=ffmpeg.org; h=subject:date:to:message-id:from:from:to:cc:subject:date:message-id :reply-to; bh=t3GxEU5rfQ3lvwu/ApknahIXPHLc9NI0aETVaf0FlAs=; b=DE3q9iZz4Me4bMKpjk9ivaee2/xoLFQShL77sQW82Ot3ssg5ANTObuQN9lYspmWnzN 6At30qXWpDXp3l4GKGPCNkcrH5JIck4RG7eDMzysRemD8EkJwSmD3ZyakURiJuJnHiKb cRE942X3rLh+0TJQZ82vG9RlGZnYAECzTWKQE8QhfZQtBSWTZJ4DDGdW0i8NO6SIAv91 HkrtCAoUCUF4Y0+dnuAv++dFJka48ndX49Jnn5itH9xy4llk9SoTynrgD9qFzykhDaFM Y7rQI3w510w1DaioS3aHMyWU4MUMPFQ6hQkBlDgzqDeRfqa2K8NSCKH4LdrBUYYGjwWW 1qsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716452699; x=1717057499; h=subject:date:to:message-id:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=t3GxEU5rfQ3lvwu/ApknahIXPHLc9NI0aETVaf0FlAs=; b=BiXB5iUO0RMOJi+woLsqhEnNcf2hi1p+ul0F5EIcXm8pL4alTaCn8iCZLWDuM2Csy6 0Y0UCdGXlF7R9uofANkBuBMFXP7cUci4WxXhMtZK4D1UevSL6YkkxBD5PIj+PKZjwmsw HgE2iECJ41Gy787YnC2ShMKQ9dbk7qVZCXTJQbtNySwjevN9Jn9D4DhHW1B5g7rIwDiV /Md7KcFVBCUDbGCvz5XSEckaLO6cn5H01OrbEl6JXwAdzXnC19OVVPbKwGjTfatd+zNv 6yEUnhGqYnSSPyBk81PBaiX7paqID4R3ixJZGyfJ+xcFWpK3AX+LKMYgKP3UST9USi0A 87fg== X-Gm-Message-State: AOJu0YzCwgyotRi+KLPgR++wPzxkKYWydrY7OtmjHKRvL+LzisR0t2p2 dD4cKO/xIZCM3GBJ/PlhF4ApGuQRvkU4CpXbiogSKXCusfIwlHV+FEz72Q== X-Received: by 2002:a05:6a00:23c4:b0:6ea:9252:435 with SMTP id d2e1a72fcca58-6f6d61bed8dmr5753145b3a.30.1716452699199; Thu, 23 May 2024 01:24:59 -0700 (PDT) Received: from localhost ([103.208.20.250]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2b3181fsm23599693b3a.217.2024.05.23.01.24.57 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 23 May 2024 01:24:58 -0700 (PDT) From: llyyr X-Google-Original-From: "llyyr" Message-Id: To: Date: Thu, 29 Feb 2024 11:28:35 +0530 Subject: [FFmpeg-devel] [PATCH v2] lavc/vp9: reset segmentation fields when segmentation isn't enabled X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xjFE4Fy6d8HS Fields under the segmentation switch are never reset on a new frame, and retain the value from the previous frame. This bugs out a bunch of hwaccel drivers when segmentation is disabled but update_map isn't reset because they don't ignore values behind switches. This commit also resets the temporal field, though it may not be required. We also do this for vp8 [1] so this commit is just mirroring the vp8 logic. This fixes an issue with certain samples [2] that causes blocky artifacts with vaapi, d3d11va and cuda (and possibly others). Mesa worked around [3] this by ignoring these fields if segmentation.enabled is 0, but d3d11va still displays blocky artifacts. [1] https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/HEAD:/libavcodec/vp8.c#l811 [2] https://github.com/mpv-player/mpv/issues/13533 [3] https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27816 Signed-off-by: llyyr --- libavcodec/vp9.c | 6 ++++++ 1 file changed, 6 insertions(+) base-commit: 2e877090f958131accb8c7e5ac10e5b9865d1735 diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 6e2d18bf9595..8ede2e2eb358 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -709,6 +709,12 @@ static int decode_frame_header(AVCodecContext *avctx, s->s.h.segmentation.feat[i].skip_enabled = get_bits1(&s->gb); } } + } else { + // Reset fields under segmentation switch if segmentation is disabled. + // This is necessary because some hwaccels don't ignore these fields + // if segmentation is disabled. + s->s.h.segmentation.temporal = 0; + s->s.h.segmentation.update_map = 0; } // set qmul[] based on Y/UV, AC/DC and segmentation Q idx deltas