From patchwork Sat Jul 11 07:52:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hanishkvc X-Patchwork-Id: 20958 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 63C3E448E16 for ; Sat, 11 Jul 2020 11:18:40 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3343D6881A5; Sat, 11 Jul 2020 11:18:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f195.google.com (mail-oi1-f195.google.com [209.85.167.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 321DF6880D7 for ; Sat, 11 Jul 2020 11:18:33 +0300 (EEST) Received: by mail-oi1-f195.google.com with SMTP id w17so6802342oie.6 for ; Sat, 11 Jul 2020 01:18:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=spbvjp1RgyA4/7Z76L8bkCHA3C7wKsqzM/1MUyVL54k=; b=li0QKIweeuxJfi/KqWuc+1wGZlrwImzJC4bpHBZfwbzYNwcA/Yc1eO40GDtUm7isJ7 M9TlFrGgKPFGLjfLiMzSb/svofP6HjjuP0ibyIfoGjKPDZuHO0vAY1HAi9zmRj51aUGZ Ov5c5ZN2XcPtFKR+tvVusEC04sgdO4Vu97B4wguN7BOUAEkCw1S/t7XIrPziAazoHEl8 /ybJGxU3sO4CqfTsRQOs6oslp2QxnOuXy5keOm1b+m9tUjEQZXi9TQYZcIhy/RwekUY8 4IHBsmBTscCGm4xV7hCkO9yPWflRh15f8wJd5hbPx+MGnrI4QafviQgUXFbZv7wvxyUz YwKg== 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=spbvjp1RgyA4/7Z76L8bkCHA3C7wKsqzM/1MUyVL54k=; b=DM11WL1tWfwbzBzVonCdQc0m7Ehd0qOqvOGNLHX1WcSF1QZtplzxJmUVQ5a4ADyd5G L9OGKxmpYb78Q7DFJ1Y+IzcY3gb3nXM0CWnyCGyBon7jADhVfAmVRK72qb2fCjQur3gS IcExBKbxYFXjr104lnUkVIpSVAQzyp9NpIFA7d09at4XpzR0nwtMFVuyB4l8tbHpwoay /kpfTlhVu0pCT+0CNTVjAhnj9DiFXfy86mX32H7gLJOm8FaLpPWULehPYHInVgyWoXeE pkr3iqQNPMcJftnRtFdQjZ9in/Hu7T1G0+wCHN/GXwMy+UsdNZ9EuEo3cIa5VSDRAFxC Pjaw== X-Gm-Message-State: AOAM5329h+CE/FYdytsFwJJ1Cp/07MFE5WX/25AO7ZqmzKb1rqBFCEfD eeyj6ea5W26lEwx6HlF+AXQs5frG X-Google-Smtp-Source: ABdhPJwbk83aD++At29OTrFtK65opW/t60rpRPR1P1h8lvt/GexBQrAhxb/wgrqBfVhI+3tY/HiQbQ== X-Received: by 2002:a17:90a:1a13:: with SMTP id 19mr8785450pjk.167.1594454036393; Sat, 11 Jul 2020 00:53:56 -0700 (PDT) Received: from localhost.localdomain ([122.171.57.136]) by smtp.gmail.com with ESMTPSA id i66sm7916339pfc.12.2020.07.11.00.53.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jul 2020 00:53:55 -0700 (PDT) From: hanishkvc To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Jul 2020 13:22:37 +0530 Message-Id: <20200711075239.109277-2-hanishkvc@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200711075239.109277-1-hanishkvc@gmail.com> References: <20200711075239.109277-1-hanishkvc@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v08 1/3] KMSGrab: getfb2 format_modifier if user doesnt specify 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: hanishkvc Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" If user doesnt specify a format_modifier explicitly, then use GetFB2 to identify the format_modifier of the framebuffer being grabbed. This is supported on newer linux builds, where xf86drmMode.h has added support for GetFB2. --- Changelog | 1 + configure | 5 +++++ libavdevice/kmsgrab.c | 31 ++++++++++++++++++++++++++++++- 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 1bb9931c0d..ac3f1cf208 100644 --- a/Changelog +++ b/Changelog @@ -2,6 +2,7 @@ Entries are sorted chronologically from oldest to youngest within each release, releases are sorted from youngest to oldest. version : +- kmsgrab GetFB2 format_modifier, if user doesnt specify - AudioToolbox output device - MacCaption demuxer - PGX decoder diff --git a/configure b/configure index bdfd731602..3bbc51053c 100755 --- a/configure +++ b/configure @@ -2325,6 +2325,7 @@ HAVE_LIST=" $TYPES_LIST makeinfo makeinfo_html + drm_getfb2 opencl_d3d11 opencl_drm_arm opencl_drm_beignet @@ -6653,6 +6654,10 @@ if enabled vaapi; then check_type "va/va.h va/va_enc_vp9.h" "VAEncPictureParameterBufferVP9" fi +if enabled libdrm; then + check_pkg_config drm_getfb2 libdrm "xf86drm.h xf86drmMode.h" drmModeGetFB2 +fi + if enabled_all opencl libdrm ; then check_type "CL/cl_intel.h" "clCreateImageFromFdINTEL_fn" && enable opencl_drm_beignet diff --git a/libavdevice/kmsgrab.c b/libavdevice/kmsgrab.c index d0de774871..c7fa2343e3 100644 --- a/libavdevice/kmsgrab.c +++ b/libavdevice/kmsgrab.c @@ -239,6 +239,9 @@ static av_cold int kmsgrab_read_header(AVFormatContext *avctx) drmModePlaneRes *plane_res = NULL; drmModePlane *plane = NULL; drmModeFB *fb = NULL; +#if HAVE_DRM_GETFB2 + drmModeFB2 *fb2 = NULL; +#endif AVStream *stream; int err, i; @@ -364,6 +367,28 @@ static av_cold int kmsgrab_read_header(AVFormatContext *avctx) goto fail; } +#if HAVE_DRM_GETFB2 + fb2 = drmModeGetFB2(ctx->hwctx->fd, plane->fb_id); + if (!fb2) { + err = errno; + av_log(avctx, AV_LOG_ERROR, "Failed to get " + "framebuffer2 %"PRIu32": %s.\n", + plane->fb_id, strerror(err)); + err = AVERROR(err); + goto fail; + } + + av_log(avctx, AV_LOG_INFO, "Template framebuffer2 is %"PRIu32": " + "%"PRIu32"x%"PRIu32", pixel_format: 0x%"PRIx32", format_modifier: 0x%"PRIx64".\n", + fb2->fb_id, fb2->width, fb2->height, fb2->pixel_format, fb2->modifier); + + if (ctx->drm_format_modifier == DRM_FORMAT_MOD_INVALID) + ctx->drm_format_modifier = fb2->modifier; +#else + if (ctx->drm_format_modifier == DRM_FORMAT_MOD_INVALID) + ctx->drm_format_modifier = DRM_FORMAT_MOD_NONE; +#endif + stream = avformat_new_stream(avctx, NULL); if (!stream) { err = AVERROR(ENOMEM); @@ -408,6 +433,10 @@ fail: drmModeFreePlane(plane); if (fb) drmModeFreeFB(fb); +#if HAVE_DRM_GETFB2 + if (fb2) + drmModeFreeFB2(fb2); +#endif return err; } @@ -433,7 +462,7 @@ static const AVOption options[] = { { .i64 = AV_PIX_FMT_BGR0 }, 0, UINT32_MAX, FLAGS }, { "format_modifier", "DRM format modifier for framebuffer", OFFSET(drm_format_modifier), AV_OPT_TYPE_INT64, - { .i64 = DRM_FORMAT_MOD_NONE }, 0, INT64_MAX, FLAGS }, + { .i64 = DRM_FORMAT_MOD_INVALID}, 0, INT64_MAX, FLAGS }, { "crtc_id", "CRTC ID to define capture source", OFFSET(source_crtc), AV_OPT_TYPE_INT64, { .i64 = 0 }, 0, UINT32_MAX, FLAGS },