From patchwork Tue Nov 3 23:17:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bas Nieuwenhuizen X-Patchwork-Id: 23376 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 CA45344AC6C for ; Wed, 4 Nov 2020 01:24:42 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7A78B68B66D; Wed, 4 Nov 2020 01:24:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f67.google.com (mail-lf1-f67.google.com [209.85.167.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BCF1068AE53 for ; Wed, 4 Nov 2020 01:24:34 +0200 (EET) Received: by mail-lf1-f67.google.com with SMTP id 126so24570612lfi.8 for ; Tue, 03 Nov 2020 15:24:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=basnieuwenhuizen.nl; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f2KHC06NGEQwfBcigPQd1qGXtxuWFnM5vtCYzINGxGY=; b=VvmNxnrmFSaB0cZ8PRD2zKss4zwDWilkCj1k77IB0ATekuKRVg93oajWssR9X+BSJV Ch1+O0wPGIvjPrPw3ReAiSjoEbe19JjsDBtAwdHZpAxrJmzBkh9NvpxZS72FPp9t80J4 HpzaWG3U4xo3nqvbf5BUEscjFSsNVCg3xc9F+8q0dQ5aS551CgTFHK9+uHajMuKmg8tO CPR70JFF6hxn5Eonr55APFtJLXC7QfeXsaiRm9ME4kQoUtOs885P0+kpQuM6ewGDmx5E sVgSQJvtr9/36E9bZd9TQkOhtHUqo1jkUFjrr2jnu/eymJ1r0kia7zPFeBfgciga6iaR byTA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=f2KHC06NGEQwfBcigPQd1qGXtxuWFnM5vtCYzINGxGY=; b=C2E19cGgW6b8/v+r9VTZ6VLwgZmWSv3BUBWn/x0Ic6pXKzX5NaMV11CFTRsKEaydtd lZl8UqqGFDGbGQd7IU5/Ea3cSDsJgeVWuWrCazg9ygjeETIuOuDuSyV93GOwB+WRP45o QIBVFFXl2/fIchJIqESYylFHMmTOnOtHwG8kbiq1LoQCNkVGFs3TyGOjONzb1V5hxu6Q y1xBJcHFkZrO9ASR0PN+mZRGSJonqa9DB7dzqpjzuq8kQ1MP0rC4fDgYPC3dEEQacl6F TdcwNruvDr3u9399bPalnpZPqqfydOc6McPlbgD/R6ucr48FAbpmPES9wYvpE0Sb9bf2 9H4Q== X-Gm-Message-State: AOAM531GDzIGHLRhbmvTmJGKqp9DrYWafo06JiMcrNMQBhO6i5EUK97E eoWt87CmY3SWGTmCePfPYhIh62rgP1z+E5PZ X-Google-Smtp-Source: ABdhPJzR2nndOfFe9AW687Cvv1g465LdlCsnfcuP63lT7WZSs9IAYm65FarG1Pw7dP7mGxahKeLypA== X-Received: by 2002:a17:906:4c57:: with SMTP id d23mr21513957ejw.321.1604445450969; Tue, 03 Nov 2020 15:17:30 -0800 (PST) Received: from localhost.localdomain ([2a02:aa12:a77f:2000:4cea:81e7:5fd4:93f7]) by smtp.gmail.com with ESMTPSA id f23sm113482eds.41.2020.11.03.15.17.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 15:17:30 -0800 (PST) From: Bas Nieuwenhuizen To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Nov 2020 00:17:33 +0100 Message-Id: <20201103231734.154984-2-bas@basnieuwenhuizen.nl> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103231734.154984-1-bas@basnieuwenhuizen.nl> References: <20201103231734.154984-1-bas@basnieuwenhuizen.nl> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] kmsgrab: Do not require the modifier to stay constant. 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: sw@jkqxz.net, Bas Nieuwenhuizen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" As we get a new set of objects each frame anyway, we do not gain anything by keeping the modifier constant. This helps with capturing when switching your setup a bit, e.g. from ingame to desktop or from X11 to wayland. --- libavdevice/kmsgrab.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libavdevice/kmsgrab.c b/libavdevice/kmsgrab.c index 2a03ba4122..8b698b7f30 100644 --- a/libavdevice/kmsgrab.c +++ b/libavdevice/kmsgrab.c @@ -176,13 +176,6 @@ static int kmsgrab_get_fb2(AVFormatContext *avctx, err = AVERROR(EIO); goto fail; } - if (fb->modifier != ctx->drm_format_modifier) { - av_log(avctx, AV_LOG_ERROR, "Plane %"PRIu32" framebuffer " - "format modifier changed: now %"PRIx64".\n", - ctx->plane_id, fb->modifier); - err = AVERROR(EIO); - goto fail; - } if (fb->width != ctx->width || fb->height != ctx->height) { av_log(avctx, AV_LOG_ERROR, "Plane %"PRIu32" framebuffer " "dimensions changed: now %"PRIu32"x%"PRIu32".\n",