From patchwork Mon Jun 7 23:03:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Diederick C. Niehorster" X-Patchwork-Id: 28154 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp3890214iof; Mon, 7 Jun 2021 16:11:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyToe+GQEKpB8tUMTe7BbRxhLHUcypBZk7p+A7+JCYF508T2kkR1bAvGHLhoPJ85xocZbgN X-Received: by 2002:a17:906:180a:: with SMTP id v10mr20132813eje.22.1623107474715; Mon, 07 Jun 2021 16:11:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623107474; cv=none; d=google.com; s=arc-20160816; b=OF51vkK6SfjLVqfex2ZhskmASFwQsVNjU1wB+ExFXhYGrkT5n2/TGvGW6GBjnI23lO mRDpx2XD4Xp1eJnOj2ftpjvfTyD+vziWXRrRKH14gXoGWyB9DQZfTgxprDQFWgju9G5Y tg283itjGGjcXqMlKKl+fNgbkHtm3wmgb3NvUNCitABU0f7zZzgWilNlKidcI5Lnlko7 MKUqE07EmSyvVlogbUfS6qDJL7wub/WSqUBqa9WwFJvCd2dqnPaU+g3oCArfkoPRTvRa uNcQAPbn/rMI9N/8k2D8+G/tkeyveTwM1T7QyZTfFadh9zlmEbbi7cuwRrxup8wYqmP6 f93A== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=OoAMEdfu0q+jysUjmUnWU5UcChrfLas+NG9dwhsW0EE=; b=0kAzpOJrzKV18qXt+8enT8pUatlHUXfIuwRFOthuvViSKvXf/tdpUr3bWSxYtavdEI OuhY+jCjpwpBqMVns3XByGKqHCqNbgEufzASk/5oxrfz0WXakq/EEfn+GCzfcmtZplZt MvaB/VWpI6/s+mkfwa68XwDmYQiNZdFnKov7f8VwSYTgINbom8RwV+czN1fmCRo5763i FY5vnUoaCHXcInVV0utH3hwU1iHlPoO/F3EDHVvjUkI9jP3FnRbCRx7Z/E8fP6Xwlvyn tr/HVfy2mQ66B/sL7aGIEOWDq2HElmsKY8FeFTbyL2aAu866aTJ7USgPYwHe58YAxp+v 3+DA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=SuFZQTSQ; 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 24si12951483ejx.746.2021.06.07.16.11.14; Mon, 07 Jun 2021 16:11:14 -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=20161025 header.b=SuFZQTSQ; 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 97EBD680C01; Tue, 8 Jun 2021 02:11:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D7E5D680898 for ; Tue, 8 Jun 2021 02:11:08 +0300 (EEST) Received: by mail-lj1-f181.google.com with SMTP id s22so4003515ljg.5 for ; Mon, 07 Jun 2021 16:11:08 -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=8Oi6aDNZ0FS0Qbgx9uIKTChQlg1nv3Uc9XuKFQnJuEM=; b=SuFZQTSQBko8J8POf1btYdw+uTkE6XjqWAvdbojit8k0LdF5m8FJy4/1xw5SsRJ72C PHEMf2scdA7WQUdHSsR7dur3V57T7lbazrYSn5Rv85JCuS7FT/GcO238M1NW2vBzpppl k9jruT2S6hwVJ9iK1yWvBrTuGuMMeghZwcGuBAfqB0OpNjFgS1MYRNG9DZUL6NMGlFJ9 0pePLVEIDtzqGoGzy8IwnpRxSeUmPQdPFQQk79vMzwJ/PAf2VVArNZaWQH3eyJGmvh++ LtoJq3FVQdVaKOMH2MBdXlPkqA1O0WpCdRp2QxlG2R5cqxfvWmaZqGQoY75I845+YMUa 6ksA== 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=8Oi6aDNZ0FS0Qbgx9uIKTChQlg1nv3Uc9XuKFQnJuEM=; b=nq0kdZyD2T/PpLdLVMBXT9LZpOYzLBSlaxlXYzkh5MUz72lqTL4+70QKT2zugWalp3 JzgQRO1aWD8CT+LGQHye0OAW+qhJujuSWzuSYCFH8DT+QR53PX7m/yQH1BVVdTwO1J0D Ctk5QBs1hVOPz9ogmn0MSGD3LcfaXj6SAnxRVSz71IP91TkJJMvJyqkuUhE/kEq5aG0c OlrcZoOu/dIhCyVg9UOv3TqZFgeJINxf/PntrJiSz3UKip++E8zPYt61yBF88h3atx7B qkbcpZIaK/KjvSL+jyZCiQ6Wl0pJyhUPZT8MFs0HHg2UrEq93GIRJ/OeS+/zOp5Pm0v6 TbEQ== X-Gm-Message-State: AOAM533yOzkPeEblONjQoFyjNUYau2s14+AVqS5oRorkGQFj8lyKz8Rv DPI2BJStNfFAGJ4D1F72LYNZHXJUOVwWFg== X-Received: by 2002:a2e:711e:: with SMTP id m30mr16754088ljc.489.1623107080024; Mon, 07 Jun 2021 16:04:40 -0700 (PDT) Received: from localhost.localdomain (84-217-56-54.customers.ownit.se. [84.217.56.54]) by smtp.gmail.com with ESMTPSA id v9sm1999563ljv.131.2021.06.07.16.04.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 16:04:39 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Jun 2021 01:03:53 +0200 Message-Id: <20210607230414.612-15-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20210607230414.612-1-dcnieho@gmail.com> References: <20210607230414.612-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 14/35] avdevice/dshow: accept show config dialog control message 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: Diederick Niehorster Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: MIkAomGdaula DirectShow source will pop up its configuration dialog when AV_APP_TO_DEV_CONFIG is received. Implementation for several other possible configuration dialogs is more involved and will be provided in the next commit. Signed-off-by: Diederick Niehorster --- libavdevice/dshow.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 9f041e90f8..b3c005d3f7 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -1095,6 +1095,32 @@ static int dshow_control_message(AVFormatContext *avctx, int type, void *data, s case AV_APP_TO_DEV_TOGGLE_PAUSE: run_state = !run_state; break; + case AV_APP_TO_DEV_CONFIG: + { + /* + * Documentation of dialog variable: + * 1st bit: if set, audio device, if not set, video device + * 2nd bit: if set, show property dialog for audio/video capture device + * 3rd bit: if set, show property dialog for crossbar connecting pins filter on audio/video device + * 4th bit: if set, show property dialog for analog tuner audio / analog tuner filter + */ + int dialog = *(int *) data; + enum dshowDeviceType devtype = (dialog & 1) ? AudioDevice : VideoDevice; + if (dialog & 1<<1) { + // device_dialog + if (ctx->device_filter[devtype]) + ff_dshow_show_filter_properties(ctx->device_filter[devtype], avctx); + } + else if (dialog & 1<<2) { + // crossbar_connection_dialog + // TODO + } + else if (dialog & 1<<3) { + // tv_tuner_dialog + // TODO + } + break; + } } // if play state change requested, apply