From patchwork Fri Mar 25 14:10:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Diederick C. Niehorster" X-Patchwork-Id: 34968 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp1376620uaj; Fri, 25 Mar 2022 07:12:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJ3q3+IMlPstMctA8mijNjiElQ/6FU7ohoSeR+ZxY/I0GpbuIItTopx2TNdSYsjQbsufrg X-Received: by 2002:a05:6402:2216:b0:419:25d2:3652 with SMTP id cq22-20020a056402221600b0041925d23652mr13354683edb.277.1648217541484; Fri, 25 Mar 2022 07:12:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648217541; cv=none; d=google.com; s=arc-20160816; b=DWqzzDaa19K8fop9/F13yXvKnmol1u12NjIDzFVdedotBeD1ANr0IZgqC3iEpdqVQn KpqvUkzPDe79pCdl56WmWvxPGI0/2/EM81gQKLr6wxFbk4lEnxccuc3LKxt26YuffFoX VKZP3D77wq4ORgwjvsvR0NAugR9wlWjIKRdqW4CVy038RebqPDF3Au59WZRUUUmQqeim 1wP15Wsg9/3EF4avf2FK/h+1fS31gIN9FPVtFqrBgPIa7wpsE27f3Ly12WVLu+E2HWbu aULKxlDwiZMQR86Zil+1OF4xig5dL6gdvgre1TE+M7q5Do6J2tdHXT6XB7Yna2FfhiOo EJ/Q== 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=qZBSiQQxre/XhbTpWK0HUMsyUYGYp1VWZkESF4VPI7I=; b=dJyLJ4maxaXtEzmvc/ajrxlKkN/l+5L385cxgU4/SlnMxqfjAWQOQhxXk8VYglE06y +/BUVQkrLlRk/RlS9xBW+7pD4Yg5qXGs7KGIeW/Jl+v5srop2m5XalsoxB0W0QfZBUGP JBRTIAimtMb1IeVJKBTPu9BsYM7LtvboecRjS+jADs1FCjcwkfP3ObDkQdXL1CsGLqFy XVA/jZniYkH+L1OBp0rb+2QFR8g9INs3yU4jGvGkkhLFBn9YNOVsOkbR8DDr0ejM4fHB O+VYa5LSq8seDXTzPciHAkmRTDsGQaT6aTJIAo8pFa2Mk4KgQDUdPl6Y/9vJe8rGAzsW nSeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Utgn2+Z6; 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 u24-20020a056402111800b0041939558a00si2518239edv.48.2022.03.25.07.12.21; Fri, 25 Mar 2022 07:12:21 -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=Utgn2+Z6; 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 DD2A668B25F; Fri, 25 Mar 2022 16:11:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4FAD968B192 for ; Fri, 25 Mar 2022 16:11:48 +0200 (EET) Received: by mail-lj1-f179.google.com with SMTP id 17so10473748ljw.8 for ; Fri, 25 Mar 2022 07:11:48 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=gvjbBjGhD+4DTkoqUBR4omF9/1lb4OFPtJ3RkssfsRQ=; b=Utgn2+Z6vKcQpfpdc8JlaI0vgkeWFJ7EXlcCPaTKNkwatQXE4jCKLUO9g++BzAEb80 I6PbTgnVXfb302Pqe71hjoKucKxMX97iSthsbyhtQcLgHshlscl9nA9dJhTY1MZrWBab sTl4yTCEiw1IrBwEczvzHFjc04l/hgLvm3ZXTD/CJdQCvaPB+qHgYQK98G02Ecowwlj7 Gi4tvjHSRoQoHHOJI/M1HGF+3UQ1XDt8QVlpxTZtt45NiSGX27M8IWzyCbeO+F2yMEbj j6kGx5d5VMnlewzHPyucPTu9QEqexu7oQbMUL+Se/AmzxF3KwuKyZF3RhBJHda1CVX2a zGaA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=gvjbBjGhD+4DTkoqUBR4omF9/1lb4OFPtJ3RkssfsRQ=; b=QWb9hrBeaplkGL4z3u7R0mJaWjzXMP+umdkyG7wrakE8RpQ6MyQsat2ZQ0wqn9b3/C MODNt3WTc4BNuWROFXhuPotXfE87U4hMTZRZf5Y8yKuzVkKvHeCflXHhV9jLCDfkbNhF 1+S3MYCAdCCjB0i+QCZECD0WTSQKwLEezAy2RRX25gT6649TMwPt6xLSKFQVBgcNU9Ko d47yUbIdLaTLLC0aM/WS0WECaOCdsF5niFUSNHLGmZ4kCV/qe4IJ3G2S+gK8OH7xWgTL DtDxqaj3r/FzgdhxvOpKbVgMnuYrG5CdwZCh4XmC4dJY+Vd0xuW23yTVSAkhcz5F6KoW 678w== X-Gm-Message-State: AOAM5324616DRo9phuhDVoFNcFvLcSmR/BDonY3NC1rCDpmC2KIFfCoK eSlBDhmIJsA0hCxJXiua5Q4mGLMhIJU= X-Received: by 2002:a05:651c:19a3:b0:249:b26c:80d1 with SMTP id bx35-20020a05651c19a300b00249b26c80d1mr5117588ljb.344.1648217506175; Fri, 25 Mar 2022 07:11:46 -0700 (PDT) Received: from localhost.localdomain (deedock.humlab.lu.se. [130.235.135.183]) by smtp.gmail.com with ESMTPSA id d25-20020a194f19000000b0044a2ad98dcasm718409lfb.167.2022.03.25.07.11.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 07:11:45 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Mar 2022 15:10:25 +0100 Message-Id: <20220325141041.1748-7-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20220325141041.1748-1-dcnieho@gmail.com> References: <20220325141041.1748-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 06/22] 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: cNMgOcPSzxaR 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 | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 652e093204..78194406b5 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -1508,6 +1508,7 @@ static int dshow_control_message(AVFormatContext *avctx, int type, void *data, s struct dshow_ctx *ctx = avctx->priv_data; int run_state = ctx->is_running; HRESULT hr; + int ret = 0; switch (type) { case AV_APP_TO_DEV_PAUSE: @@ -1519,6 +1520,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: { + /* For documentation of dialog variable, see ffmpeg-devices.html in docs */ + int dialog; + enum dshowDeviceType devtype; + + if (!data) + av_log(avctx, AV_LOG_ERROR, "Use the data argument to indicate which dialog should be shown."); + dialog = *(int *) data; + 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; + } + + default: + ret = AVERROR(ENOSYS); } // if play state change requested, apply @@ -1539,7 +1566,7 @@ static int dshow_control_message(AVFormatContext *avctx, int type, void *data, s ctx->is_running = run_state; } - return 0; + return ret; } static enum AVCodecID waveform_codec_id(enum AVSampleFormat sample_fmt)