From patchwork Fri Oct 22 11:44:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: caleb.javahacking@gmail.com X-Patchwork-Id: 31214 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp1703057ioa; Fri, 22 Oct 2021 04:44:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBENnIm52nfVSuwE1Rm/4JqGB4Uga2pnFKpP3bXxBT1+5GDgwSpcHVSwuzx75mmsEe1fc8 X-Received: by 2002:a17:906:e85:: with SMTP id p5mr14830230ejf.159.1634903088310; Fri, 22 Oct 2021 04:44:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634903088; cv=none; d=google.com; s=arc-20160816; b=i4aCQWvmg5nV/XPdVjmFXlPT33rheYjvFBDA8BKyG/uLXlfq8BbEVZaeP8fzPmUOt7 ozZAE4oykvqz700jXqlfha/JvzRNW3ffMDZ9f/911aCRn5nLLaUuMQ4jxj2UAzYbcZ+0 b5vD8T1kZjKe2GriBMwoApWVxdV/biVX2j8PbltsF5QuWW5UE/8LzCIPY9jEvJBBrzRS P02kFQmn1294vDbtxHUmxrctNLsthY70OBIuTuvOcQIVm7zBaaZSaVZNnYRcLBFVxPQk k8HqBCNkFK+7wOXRCt0w5Crs1/obY5m5QZFXw+Wpnm4jhtFQgi0HPz1f1b402Nklw5LM ypmQ== 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=eBT8Dvwmu9+lIbJBdkbqny6hVbX0eU7P+vF8QMRiiW4=; b=C4TXA6ThxM2dGQ3oZcYGIzMDkMT6L9p5gvG3Bs/OY2z17HeuX23y5zILc8RbeaS8fb qmk4NqkQkjJQkVw5fRyXl2xtnN1nI5xmZiRQsBfazVd29RyB8orR3u2wC5BwRyKECJqp GlkmxQWanMVZ6RDk0Kl3ndSQZUrRD+CrA49/QEhZbmhMLqkibPlSPMN2gHvMDhXX8pne xe37AAnPHCUdl0M9OZBGjlFuDpPkqBE2AlwxHxF2nsZUhp9EQzTUeiKeYhYorIVhSpMn rmjm+ac6WDhTEtr/5EkbLYUxMfpL7waK8Qgw+VmpH+Iehnu5vGKqBlMxTiyMc+b17htb AL+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=aDVfWbPB; 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 b18si12741690ede.158.2021.10.22.04.44.47; Fri, 22 Oct 2021 04:44:48 -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=20210112 header.b=aDVfWbPB; 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 E37DF68813A; Fri, 22 Oct 2021 14:44:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A6CB86898E9 for ; Fri, 22 Oct 2021 14:44:37 +0300 (EEST) Received: by mail-wr1-f44.google.com with SMTP id r10so1089023wra.12 for ; Fri, 22 Oct 2021 04:44:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=yPs45zXWxTJvic/QwLLDgyrLPeRKoxDCjSg9u4BctK4=; b=aDVfWbPBjAH1cpoMCKiSlk4S8vncXvPLKmYTXMsV2fW9g6GQrNutGkXpBTGZZflhgg LeTgEqWsLrLv+sumPrpLbZapIijh2zW1v4gn/yvtDcWBib2jCbTahMizaEYRrZiBOZNh EAbOKjJyVUAj9NyAdep4BOnN4HTXG/q7CmLwN51TkTlIOhFBvaaNxiMSBa6rPlXe8ruS IJ1Ki97+VJ9/KNuIpF33jHGYMB5Oi3MoH6I18PZ96kQY6/LbPUnyL0rLJgvJE6zgiwiB pFI3P8o6YCYFRHRdnKfpeLeBeuSvXg8r+StHCaeiN28cYFy5BZwrrskQ+eB/8HOZBZND h7tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=yPs45zXWxTJvic/QwLLDgyrLPeRKoxDCjSg9u4BctK4=; b=yc0TDmI2JcAxzdTB8u82E9/04nF+8LKXmPN+YYAwhLlXRDA9ZHqL2Va+XKgCVQNewv 4r1vt3NX15xK4Bhxep4yaYrIvQWiKhKj/YscRaMExJgvPUuvKoi3EDb2JtkIMNtYNfss yTs7E3IPFvzK6aUTkfWRgNIN81+GYkALuyHzKcIJG4QyOFZx85XuhyuoYuVn6n0eGT4r 5lS/LjauZT++uGyPBoXxKOLyY4YhbtTPuqoZZPpBUY4un7IoNfLVLqQqmTMkGwyf3dea 8stlSmQXWBnIwlkGXfTNuIH6OSgsDWPPL2M/wmQHbH415Ym89dL1mLG3yIGl7gE84Vkx K3zg== X-Gm-Message-State: AOAM532ixL4m6JPjM563NGkbopzWs6C0tCu0g8ZYZ+3Y4K0R2IjwHq/r UncvpoxzWWQ93hbA2aYSIZhLLhuaZhw= X-Received: by 2002:adf:a28f:: with SMTP id s15mr14650594wra.138.1634903077060; Fri, 22 Oct 2021 04:44:37 -0700 (PDT) Received: from localhost.localdomain (host109-155-104-191.range109-155.btcentralplus.com. [109.155.104.191]) by smtp.gmail.com with ESMTPSA id f8sm3069662wrj.41.2021.10.22.04.44.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Oct 2021 04:44:36 -0700 (PDT) From: caleb.javahacking@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Oct 2021 12:44:27 +0100 Message-Id: <20211022114427.2044-1-caleb.javahacking@gmail.com> X-Mailer: git-send-email 2.31.1.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] gdigrab: added option to select window by HWND. 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: Caleb Whiting Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7oY8bFLJRHVZ From: Caleb Whiting This allows more precise selection of windows. --- libavdevice/gdigrab.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/libavdevice/gdigrab.c b/libavdevice/gdigrab.c index c069232472..266da3414c 100644 --- a/libavdevice/gdigrab.c +++ b/libavdevice/gdigrab.c @@ -231,9 +231,9 @@ gdigrab_read_header(AVFormatContext *s1) HBITMAP hbmp = NULL; void *buffer = NULL; - const char *filename = s1->url; - const char *name = NULL; - AVStream *st = NULL; + const char *spec = s1->url; + const char *spec_value = NULL; + AVStream *st = NULL; int bpp; int horzres; @@ -245,11 +245,26 @@ gdigrab_read_header(AVFormatContext *s1) BITMAP bmp; int ret; - if (!strncmp(filename, "title=", 6)) { + if (!strncmp(spec, "hwnd=", 5)) { + spec_value = spec + 5; + hwnd = (HWND) atoi(spec_value); + if (!IsWindow(hwnd)) { + av_log(s1, AV_LOG_ERROR, + "Invalid window '%s', aborting.\n", spec_value); + ret = AVERROR(EIO); + goto error; + } + + if (gdigrab->show_region) { + av_log(s1, AV_LOG_WARNING, + "Can't show region when grabbing a window.\n"); + gdigrab->show_region = 0; + } + } else if (!strncmp(spec, "title=", 6)) { wchar_t *name_w = NULL; - name = filename + 6; + spec_value = spec + 6; - if(utf8towchar(name, &name_w)) { + if(utf8towchar(spec_value, &name_w)) { ret = AVERROR(errno); goto error; } @@ -262,7 +277,7 @@ gdigrab_read_header(AVFormatContext *s1) av_freep(&name_w); if (!hwnd) { av_log(s1, AV_LOG_ERROR, - "Can't find window '%s', aborting.\n", name); + "Can't find window '%s', aborting.\n", spec_value); ret = AVERROR(EIO); goto error; } @@ -271,7 +286,7 @@ gdigrab_read_header(AVFormatContext *s1) "Can't show region when grabbing a window.\n"); gdigrab->show_region = 0; } - } else if (!strcmp(filename, "desktop")) { + } else if (!strcmp(spec, "desktop")) { hwnd = NULL; } else { av_log(s1, AV_LOG_ERROR, @@ -338,10 +353,10 @@ gdigrab_read_header(AVFormatContext *s1) } - if (name) { + if (spec_value) { av_log(s1, AV_LOG_INFO, "Found window %s, capturing %lix%lix%i at (%li,%li)\n", - name, + spec_value, clip_rect.right - clip_rect.left, clip_rect.bottom - clip_rect.top, bpp, clip_rect.left, clip_rect.top);