From patchwork Sat Sep 14 05:32:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cameron Gutman X-Patchwork-Id: 51576 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9fc3:0:b0:48e:c0f8:d0de with SMTP id k3csp203851vqy; Fri, 13 Sep 2024 22:54:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUdp/fMKb9PfAxwi5ZdJ8nkjrnpFNzcaugh6oMmHYL0WnlVPKHbSdkx5i6h/nXTyu6ykvqKlWX6R81RjgYlqQLY@gmail.com X-Google-Smtp-Source: AGHT+IH2OEwAW05sL+4FOgj9VD+7ZDAq52FoDrqryCtlP2kYUAQG7iCSiTRMeDV8TJllD0UCJUh4 X-Received: by 2002:a17:907:7f20:b0:a8d:2a46:606f with SMTP id a640c23a62f3a-a90294ef246mr802322966b.38.1726293252247; Fri, 13 Sep 2024 22:54:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726293252; cv=none; d=google.com; s=arc-20240605; b=ZfD9dpRXX8ojfNgcZqPBLEm/vuc/E4IDa7+NK0JhD8NiEpFf0xCtirKlwuTNbm5E+Q mbP6rMvi3wain0oKZ5S8oNsd9Y30qnHfMkwQ/I81JhG08DCuHKTKZlhUxDwt/R55EFkh YVmU5tj7Z+GSxZP+DU/BMTclbVEY4IO5yQeaY7lknE/Xe58Og5qTwHQWgXhGMztb8x0o zzmiYxeyL8XzQnxOBGH7pPFjqU1bRXkVIR3vXKPXu9/wBVY8wfRiJHr2upSZ/xKBBxQ9 CQi26/aKYGwtuY0Fdtv4GRRV/ZI4Xdub332ilJ32fIMj+4nFohxHvVFfbb5bVrZ1WuiQ Eysg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=6yNvwgoGnj6EgCqhlWlRBQ2ox4GxlddJ3feHwBJJ7qQ=; fh=HEaSEL8gmd62htwogUzk9TX2NpB6/D3C/VAHvouth0M=; b=Y4jb8Ul3EE9OzxctHAmATgNM4bwgYCLqxJq82sPDXKhdHVX3e0sd7vymhKYJDL0ubH frdarN057aaWmqoY5hfXK0BlZgOs0qGrVEWSNN9MF6C1n0gWtfrxmttmXPrRFiv1ZiR2 k6mir+PxCwwFS5EfIsfODEAySYpLo0G9BwCSYtQLwFcprbp7JfaPUEqQP34TWiTCM/SV +WBegoAgNnkXzrVNoqiREmJBm7VoEPIm+ZQFcrLrdL5v9QUTZ1nHlHfcbTA3uCdd5Ke9 7SZsv4/xVWnhvaG77TMgyRTLRHWHCwmBm4mUDaRCZ+n5Efzi2+V/5Z9KcLHdD7r7hNDp yOgA==; 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=YoEvHZFb; 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; dara=fail header.i=@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-a906133623bsi49755766b.745.2024.09.13.22.54.11; Fri, 13 Sep 2024 22:54:12 -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=YoEvHZFb; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E427D68D7D0; Sat, 14 Sep 2024 08:34:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f52.google.com (mail-oa1-f52.google.com [209.85.160.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 842F868CEC9 for ; Sat, 14 Sep 2024 08:34:21 +0300 (EEST) Received: by mail-oa1-f52.google.com with SMTP id 586e51a60fabf-277c28fac92so1057696fac.3 for ; Fri, 13 Sep 2024 22:34:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726292059; x=1726896859; 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=PbU/leYim3X6OAYa0jDuYdmhOs+NeLnDioUQcg+2T+s=; b=YoEvHZFb2C0e6SM06S9hvqhMOVlS3NiTmswytbVy/tdaRQlb7Egw/H9MVXexFy2Lwj UDc6bsfAwZCdFH2KAmlnuJgHXD3+l6TfR/bBw+sDVbFnrH89isfp+I8M/WQj4xSBr66M HDkvPWGEC5LubQYJ6jSRAfVmnCAsJPM/Xm1E3VoBepBzIxR0h5Su9OmqkvvO/cyw69dV fuVi0FuMLDpmZpDixXliLjc0ipv03kio9qlHvVlTZDO85cLKB50nShULVuuxyoW9HrDV YoFgaxSAhbqnfOblzLd9GYeQXObN7IWhBWypwTsntNefuaiiWi/7M20iYGFBP0uzdu/k oM9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726292059; x=1726896859; 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=PbU/leYim3X6OAYa0jDuYdmhOs+NeLnDioUQcg+2T+s=; b=c8/Dkkujex7Z5Q68AEH6FSI1XhyfnhFF5CHnrgFtHehZCBORpXfEPeLBbu1GyY5QYc UXDRJKGsBivnM5mW0XyXZrOOHW90E6Sg6ebRD6PfcEMdozBtKRpR0b48Wu3BrJ58SHPD RG6BX9IxlPuShFBkMJXWyvFkkLaqp2G7vHLFdkGyUVXdBtiVln43PGrqSsUqv1QzcwcT /syE7vHtrjmZNBGWAiF1MdTui8lXL6Jv8RAnr5/q7fCvb4p1ZO52nyd+NQehp/8BlnIo uNBBmjZogNMo7cpIP/45uasPYUmcAcEhWN7Tcj6SCmsAMhk7TtBwgPG7qt8bds4rAwlm ZDDQ== X-Gm-Message-State: AOJu0Yxbw/dd2DVs9ou529JPbgFG4AZrdVLgiRr3+xb7hg01grIA8CfJ Y+Qx5+HtsxCMFc4Vr2Jg/A2LdVbzSLOzpjjAYZcDhaQlGYjtqV5s2Gt3pw== X-Received: by 2002:a05:6871:9c0e:b0:277:a36f:fb4 with SMTP id 586e51a60fabf-27c688a6620mr2832623fac.10.1726292059175; Fri, 13 Sep 2024 22:34:19 -0700 (PDT) Received: from localhost.localdomain ([2600:1702:50c6:cf1f:408f:de8:2d1e:37df]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-27c9598cd24sm283689fac.53.2024.09.13.22.34.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Sep 2024 22:34:18 -0700 (PDT) From: Cameron Gutman To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Sep 2024 00:32:05 -0500 Message-ID: <20240914053407.142-1-aicommander@gmail.com> X-Mailer: git-send-email 2.43.0.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/amfenc: Fix inverted loop filter option 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: ovchinnikov.dmitrii@gmail.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7jay8bKhV/1u The AMF HEVC encoder takes a bool option for whether deblocking filter should be _disabled_ instead of whether it should _enabled_ like the AMF H.264 encoder does. The logic was accidentally copied from H.264 to HEVC without negating the bool value, so the deblocking filter was actually disabled when AV_CODEC_FLAG_LOOP_FILTER was set. Before this patch: ------------------ no flags set => deblocking filter on flags +loop => deblocking filter off flags -loop => deblocking filter on After this patch: ----------------- no flags set => deblocking filter on flags +loop => deblocking filter on flags -loop => deblocking filter off Signed-off-by: Cameron Gutman --- libavcodec/amfenc_hevc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/amfenc_hevc.c b/libavcodec/amfenc_hevc.c index 71e7d8aa61..7b4b2f722d 100644 --- a/libavcodec/amfenc_hevc.c +++ b/libavcodec/amfenc_hevc.c @@ -269,7 +269,7 @@ FF_ENABLE_DEPRECATION_WARNINGS if (avctx->slices > 1) { AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_SLICES_PER_FRAME, avctx->slices); } - AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_DE_BLOCKING_FILTER_DISABLE, deblocking_filter); + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_DE_BLOCKING_FILTER_DISABLE, !deblocking_filter); if (ctx->header_insertion_mode != -1) { AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_HEADER_INSERTION_MODE, ctx->header_insertion_mode); @@ -511,6 +511,7 @@ static const FFCodecDefault defaults[] = { { "slices", "1" }, { "qmin", "-1" }, { "qmax", "-1" }, + { "flags", "+loop"}, { NULL }, }; static const AVClass hevc_amf_class = {