From patchwork Thu May 23 08:31:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: llyyr X-Patchwork-Id: 49168 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp880395vqf; Thu, 23 May 2024 01:32:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWHJgCcfk4ltDHy9jCemDB8VpWXWtDYEOjd1rpQ69liOja4XMnVyzdg8KswtArILlZ8IU82tm+KsKTQOP49KQ+K7yJEvKduiVpgTg== X-Google-Smtp-Source: AGHT+IHBCSMI9BLRKI+KAcO1dugrxU6I2aHrsFH398yrsxzmMSZkM9q8jmQCJf2mQb0vqfYWSGOm X-Received: by 2002:a17:906:d8d1:b0:a5a:177b:d8d2 with SMTP id a640c23a62f3a-a623e8f87a3mr109369266b.22.1716453128948; Thu, 23 May 2024 01:32:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716453128; cv=none; d=google.com; s=arc-20160816; b=cVBUzzDtdUyqbFiT3gs9TN9sw8sU4OeDPBGi+NCj6SI+Q+zdngLZqo4FWlwksyBngl LpR0pbM5f4XUTpsnEkNrLa+SGjvyAaDD0cMxMJvVqSJH4bzbixlLeWd0Q9d8Lib+kquR YDwwGuo5XIRrBMnCWl7HB7wyqDK37UHmMQvy2D1OJQH42WH5VllpykaleFfuko4mcczC nQGzD4/1f0ki7eD83eUSlvqmnallak5VKE5ZJJ9X7FyL9Lg/ZLVt2+kxDwgomybxK5pL yOiI1ghB+dDdvQ7j2jlnsAqwL8hN4r9FnMjVUdvYehlnBxLpKFtpx8QjlXTueHuAkI22 5Xxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=cn3RcsAAWlnewgMYL1t3eQ1bLV3xGQwhn2IluR20WTU=; fh=I77xw9+Ebx1YIqejRkgRMKWDR1+OX1d27AvmgSpkHUc=; b=b10jcyh0wiuLHwdxfm/oXM0Nk8KImwaQlRGjFFcCQrqGZRvdiqs4tG/fQ6qL6VZD7u M1u7NSJsXeQbflN/97nBm1PYKQFybCb7hxn9CQN4pPc5rAP9TN4b1b/jvq7RFdktKk35 LTo7jRJeGNnUwppxMqQ21RiTNxOyf0fKHm0leewKjL4+vvUXpaJRXCOTDO4ZIEJlmE9D dLl1G5zA3FSri1zd/V2eFwRIJ5udMbqNgCWsIcUrR1RxgWe3crSjFavg0hspNsfO7dGb p/8NmulY9KXTcXW/pPRcMPo8kBmybFy82ZhHJ8F0SqkcDM6/wkHwl5AGbM2IjA0BSYHF lYnw==; 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=lSClAbZl; 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-a5a17ba5651si1655079966b.601.2024.05.23.01.32.08; Thu, 23 May 2024 01:32:08 -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=lSClAbZl; 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 0767D68D3C6; Thu, 23 May 2024 11:32:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3051868D1BC for ; Thu, 23 May 2024 11:31:59 +0300 (EEST) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-6f67f4bebadso2063932b3a.0 for ; Thu, 23 May 2024 01:31:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716453117; x=1717057917; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=hs8114GRhX5lgr3lHIZHKS7SDu7xUu6KGlPE55FHzho=; b=lSClAbZl1eIX/BnF3F6iUYQN8mEJLr75aVRzRm1nh3EXU1eJgGPLtIELN6uU9f1xqz PiJRbR202ikdwFo3YNEr643ovhY1NYOYfw0FkejGe/YcMmHPKgxpWjQTGvD8Hih4t/C6 m9q4WSCgZ4RF+Ocl0M+Zxk7q4JQEP3j7ji0MMN8YnjCPjHqbK1y4NpPnfPdR8fyTkIZ7 rJlw2t3j2/d+VG+VtTX6RQ4rVEvWvphoO4tEbYWDeDlGLdveq49xl2IddxMLE2zUprpF G7RrJQiQVeqYK9aIeTcEpcql669l4E4bxgeE/GdcHrXPE6sbVgYdpHmZN2TpsVjUN5LO MgPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716453117; x=1717057917; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=hs8114GRhX5lgr3lHIZHKS7SDu7xUu6KGlPE55FHzho=; b=aiGQZdmPI+1uqj3Zy+O93TAQp/Y4Gz4oSSb4hjAfoSf7wU6uJm4px/oauu3Epu+BYi 0rr8vYrbQbnbXRWJwgGuc3vYJpSK6kuuzI5v5E7bC6Sf0dkAXqAnnmiTt6uwbYfQHKwn xTE6lhdJJDI7OpXOq1Ak8urtPKsd/QmDfT/mBTGPhX0lKyvLlV5L/peJVkVi5CdkmwST I+5rKmBCMLsbxl8f/EbKxqR/Z9GHw2y6aaNhEq/+Q+5swVn2cHKm4WGzDTJyX7FLQQ/a +aMl+wf2y+3JtHcELmMRUxrr5qyYTuQEcj/sqLA5hI5NrEE+fkCRdpOzXVaS11pN/9Ra dzoQ== X-Gm-Message-State: AOJu0YzFj7xjxD8Tw2j1bUpwDo7a1W9OWuNQLr0tDuKsSv1KrUpay/3b ztCkQMkXnaHUhrp4pNWJLsPIf1jWsDSP4ukCf/fRvuTvmgJZw6/U2cNuig== X-Received: by 2002:a05:6a00:1912:b0:6ee:1c9d:b471 with SMTP id d2e1a72fcca58-6f6d61665a7mr4437763b3a.25.1716453117104; Thu, 23 May 2024 01:31:57 -0700 (PDT) Received: from localhost.localdomain ([103.208.20.250]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2af589fsm23623335b3a.158.2024.05.23.01.31.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 May 2024 01:31:56 -0700 (PDT) From: llyyr.public@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 May 2024 14:01:51 +0530 Message-ID: <20240523083151.31699-1-llyyr.public@gmail.com> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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 Cc: llyyr Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: eFs3p4Fa5Oa6 From: llyyr 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(+) 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