From patchwork Fri Nov 13 23:15:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bas Nieuwenhuizen X-Patchwork-Id: 23618 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 ED8AA44B79C for ; Sat, 14 Nov 2020 01:21:26 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C459168C1E3; Sat, 14 Nov 2020 01:21:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB3E6688178 for ; Sat, 14 Nov 2020 01:21:19 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id c16so12745191wmd.2 for ; Fri, 13 Nov 2020 15:21:19 -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=JkTw24uOsna04k8mAT0eXu+Q/PbNdhJluMnf/0EGq4A=; b=QQtWptQJo40ozEO2LeggIolM5gA+MrayOIhLUGvWsttDNSojUGwKv1sXU65BsjSZRa 2toshTwSK/nMkK7mCQGNBMZyPo5duMEBUbj07ykK2Uoi7Dernu3Y4AN1PRyv9Jav+t+8 tHjveMN2MlMDr4Wgwh/bxYEx9ynxWECqBFLyMbmvy9LAuw1/+JINJZ7GSYvmy6a+DRKT 672+OF44CKu5HfU5dU5E4YnA30XEU+iYBj8Pg7j7+bViXoAKkt6INTsFVur1bkrWEqQF FIOUeguOR6P0UvRkLu5Z4KJZTtFcVRDE37bBBi62uIvsKSZALCOceAjW86BHgxAVhhQ3 7rNQ== 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=JkTw24uOsna04k8mAT0eXu+Q/PbNdhJluMnf/0EGq4A=; b=CaiRFPDkabQVg0vwFKkOWBgnlKdPGIA1dCXLQfRN0jvsGYPdBzCpzLMrlVjRj9aKeF bSOKhD7eSn9/oVq9px3Ua5q74X0zcjbmgevk8kRDLYqAiHYrUnflwuq09ueHJ7I91lNg 2H3gdp2cUNEZXxa2Ek105bZEQgbE+vvvo+MsKx69h6N7mXaSXXtT53tpQbssxRfI/3v+ 9TwBx+e0fngeio/anGtJwJqLQ2li0qCzBTDc9SbGwCqQ84hi9mbBrEOr4MA5cLGiCLU0 C4QgdxN8pu35YYY3rDh2x4BeMcKRBNdvVB+4+g40Uabk5YiEO/Ip+S3UwYZp9VStHA7j HfVw== X-Gm-Message-State: AOAM532OWUkhjZhG/bRam/ttoOPrfQUfxysUbjUT73OBcY7ZYIl29qf4 QOmVO4W5Nqd3EJmI1rFv5aAkMxviApoh/0IC X-Google-Smtp-Source: ABdhPJw42fPidA6JRRGJoXARUA7ujo4LzvBA95AaBg4044FEcc2JpV1swWYU0Ipe1R9At/0qgdrnRA== X-Received: by 2002:a7b:c1d2:: with SMTP id a18mr4833220wmj.41.1605309344695; Fri, 13 Nov 2020 15:15:44 -0800 (PST) Received: from localhost.localdomain ([2a02:aa12:a77f:2000:4cea:81e7:5fd4:93f7]) by smtp.gmail.com with ESMTPSA id a17sm13633512wra.61.2020.11.13.15.15.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Nov 2020 15:15:43 -0800 (PST) From: Bas Nieuwenhuizen To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Nov 2020 00:15:47 +0100 Message-Id: <20201113231548.869559-2-bas@basnieuwenhuizen.nl> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201113231548.869559-1-bas@basnieuwenhuizen.nl> References: <20201113231548.869559-1-bas@basnieuwenhuizen.nl> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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 b740a32171..94e32b9cae 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",