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: 49167 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp878971vqf; Thu, 23 May 2024 01:29:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWLIDq6x+rmhk25nj0EvobZo4O3qwYFKlR2bYzfsMR6ZwG3Hnn8Qjvn8eSya4ichVG3ExY7K1/5xkUqI6cYA2U0NjDet/zx1INB7w== X-Google-Smtp-Source: AGHT+IFB9NfjFPbp7fH4EbSTghKZlKX5/fWJoVWkuntu1OGW0Gdn3nEy33X9iVs+GA6tadc0Im1v X-Received: by 2002:a05:6402:f12:b0:574:fe51:b3b9 with SMTP id 4fb4d7f45d1cf-578329d284cmr3949923a12.1.1716452959615; Thu, 23 May 2024 01:29:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716452959; cv=none; d=google.com; s=arc-20160816; b=sT0DSAnAmvI/ILP17t/l6bBa6KkFJyC+ah61F22NoGzhrohB+xjE+PzYywfv+LYImh F3eMatXBTzFjcE915f45DLh8yqn9qFuvOc3NlMWVpVDKRPKELODa0HzDjXm65WwU7Xid 9qUV3qpk5c5aWMQYwPAnPo9DlB9KQdW5xtjZvAncJJ0r4Ph52UtA5KWfNwkFp2iLRyLk /EUMYqPrQ+1fVy2RSOSCiThEAEwelWzzpIRUionKLLHbNdj2LRHo2xwjjJIq4w3HQt6X 5BIxlPkgHb0/v5gVkwCGlDJ/pyVUVYcEKP9rpfGjtoKaDF1O6Nhv8VnORyL/zNjkZzGK dEBw== 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=BNxvBthDovNFzfhEvjplXu8/cg5XmIDpmBFr7ZRQTa/7EAEd4ZmX8SGbm3F015ipxJ KSQTr8BekpJHu+n+NDnXmZZ/nMsnxjl+VN1ilvazkIHs1pwkhuIGosIXHNqg5D2mTXG+ n9oDKcpR7og7iYHPx0UrflVF5dF0CHwLFwTu5saShF4Zk6KgatFezmotc+Zh/ZB45Huo G4dBFFQFeIDrvtsnvTm0wUXCDo1dRXtlsOH7x9J7QvEqWrKIMEFfF/jXGQSUyCh7i7P5 v5iqy81IJob3tMN5MWUfoCv+tjLGlQ92tyw11U0XnIC2eJwmkQ8tA6uRm43XT/SQQXPB O9RA==; 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=m96lzx6t; 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 4fb4d7f45d1cf-574f9341724si9444721a12.552.2024.05.23.01.29.19; Thu, 23 May 2024 01:29:19 -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=m96lzx6t; 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 5F77968D3CA; Thu, 23 May 2024 11:29:16 +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 CD78568C4C8 for ; Thu, 23 May 2024 11:29:09 +0300 (EEST) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-6f73cd613aaso491163b3a.0 for ; Thu, 23 May 2024 01:29:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716452947; x=1717057747; darn=ffmpeg.org; h=subject:date:to:message-id:from:from:to:cc:subject:date:message-id :reply-to; bh=t3GxEU5rfQ3lvwu/ApknahIXPHLc9NI0aETVaf0FlAs=; b=m96lzx6tGaQ6gHXss+09upYdjMCkaycn05zVZPVs1U8Du0bYGw7zV9YQj9wpZFBind jOXweP4/XZjDKp1jA0+/s8Ok9WjxEEkNAhd/WScC0zMljWce4xLBJG5n2AQFgteBtgeP GFkdvhwOFdIfhl2R7/Y1GCc251QTQlu5Rc+7ZuAJWAECKjyGNRi7CpjzBW1oDFUxJs9L lxbLuz8uJyMjEFMlpaee8dTeYsw0lbSt0n1bErQgzxQGmGgc6rc89POpZ+jDr4iSzNOr 45WnKkxIq8pauIsQvswtB+S0EmaewcRfALSat6Ve1huyPyAl6+PeYTnqmYCCEjeF3QKo OEKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716452947; x=1717057747; h=subject:date:to:message-id:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=t3GxEU5rfQ3lvwu/ApknahIXPHLc9NI0aETVaf0FlAs=; b=DM7Zawni+JnufL4HIJ/Qv/yQ7mxtJlX2ahOFmOnltts9FkmkkVpRpq0+kutW9/qcTH n1LvVG8gkpOPStF6gSDFkuQkMIh1cwc+uJM1qu7BbFtxjxJc8FnHT+q3kiLV4YZ/+wwV FmGftk9Sf+AGMLerO80LpgMrZckurHOkGsELktghVtYEZ4lrTUraX36HhKgBo31xXjvT kRAcX2Rl4aqsS6fIrwXQVfLySUc0ZjIu8nCpxkbeNhHry7AC8vt6rl/hTEMUHAGz1y5x C8hfzmehZS3j6nHu5MrIjAGCAy+jgv8rrY1Obe/GstVt4aetZmw3awRtB13emkHQ5n+P Byzg== X-Gm-Message-State: AOJu0YwjES0CHPiU7mn1LdkTJRoe85VUrE6flO0wdkUULl6icoRCJNYl 7LhNCWAzq8he11EPW3W60OT5syzl1UMhsxXkc4gZFe7MHT0jPioWn0p20w== X-Received: by 2002:a05:6a20:9688:b0:1b0:3910:3796 with SMTP id adf61e73a8af0-1b205d0f382mr1743073637.31.1716452947350; Thu, 23 May 2024 01:29:07 -0700 (PDT) Received: from localhost ([103.208.20.250]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-63411346dc1sm20724831a12.83.2024.05.23.01.29.04 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 23 May 2024 01:29:05 -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: 8+XONGUIyWr9 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