From patchwork Mon Jun 7 23:03:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Diederick C. Niehorster" X-Patchwork-Id: 28163 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp3904313iof; Mon, 7 Jun 2021 16:34:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxHkXKOUn5liojwiGa+mRmJgFtY6lS+EtFCRrJcxsik+Fh2gLjJcbhtijfbd4AXZZMFljda X-Received: by 2002:aa7:cd42:: with SMTP id v2mr22781972edw.245.1623108869580; Mon, 07 Jun 2021 16:34:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623108869; cv=none; d=google.com; s=arc-20160816; b=ZqfNHHzIsthqC7Slv64jPpl9uGf0O8RLBnmX/JqO2auUm+cf29piyVArYWHThKfXrX +UZZjEg40eU+TZ25fzu2oRUc8YYSa1JgYsPc5cwLsG9SJFqH9YPkQ3LV6T5Y6a4IODuC G34bbXuHtILJ2DQ2YcYxqRLqas//fUpH0A1Y5ZHZPD8cHh6Gym7VDPhIsg2Jiu4ywudr BcYuWZuqHpbTTqLJwFR2K7T4CmXoMCb2Mq5aoq6moghbNXVGmVZqKbVhcM2ILVkHO5Ys Y6MG3dmvAyaJwY8/3Ze7ZTwdCS04MEedzRzXGoLp4DBRY6RaUjQ3bBJyCPb4cH8sa7H0 JNAQ== 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=gDLr+lsIJZYjCEbYQ5l7OHpxwfQoGdz/iKYJao+ru2Q=; b=iW5Bg2NjnD4qgHtUXleQ6gXU5IvLs4MnPMCkeN4xQGDRqduE5VIq7OUGPabxnUXlkm O2GkZE5m6FPrRh5ENzNjRKkk+FK6D2zhzur0F5L7uFFM1XRqWR9awYyk4OcvKfpf0d7k pi0SoZf9aeGkrDn9nKOkl0bO1MdJXAyLCN95HVpRv2pvt86Dk6rfE9/4qXkhZo2RUmYn uGDDrFqCdlTOCmLRc8M6PDDOJuHbUy0xVqdsJpCg6LNx4CESET9rqIa62B9dHS+OPazV 0mzCJuM5zxKZ5zfzct2QYX35VLTQ6TPoIB8vmULEfccX0zY9V8U9vdBS+o/aJYSqm/BP yAUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=m0CJ6Nls; 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 b20si11059214ejq.607.2021.06.07.16.34.29; Mon, 07 Jun 2021 16:34:29 -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=m0CJ6Nls; 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 67A2E6808F5; Tue, 8 Jun 2021 02:34:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 81681680226 for ; Tue, 8 Jun 2021 02:34:20 +0300 (EEST) Received: by mail-lj1-f169.google.com with SMTP id d2so20316315ljj.11 for ; Mon, 07 Jun 2021 16:34:20 -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=/GbahymUo8EgUi/GGGeyBCtgTFGWUNA/XWWTFi37dxw=; b=m0CJ6NlsAPgkK+1Su/sbEhfe4eiANDD9IJ0JwJ293Zxa8mbLLnaJr624IxxlsTOyEn UPksK5VWBxRK4+B9a9F/PCH5LEOBuW4nLLFEOgzTg0JsoCfytA0WU8OE3mDfbdcJagT4 UjVyiz5FnWJ6+Ko53MtRSyCB54dON8vMl88XYEDIcn6efsEMegj+XQ8eZTvFF1P+kxG6 cPFNFnGG7dFqvKzLw3aIlrBG758PRQJtzCL8DTET4HcrrPoIIUBvZXcMrEv7gsBSXXsP w6opHcG9jXJNpPAIFEBqd+F8TG0K7ha0Xj0tCqvywHh1Ej+ZR+UPw1ggEJPGH8bjaist 5/CA== 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=/GbahymUo8EgUi/GGGeyBCtgTFGWUNA/XWWTFi37dxw=; b=gEJi1IS6BJHW6LVlZksZCwL3ghukLIHGxTOWFAGs95JI6GGXtD5MNwqanuxSt+HjDY SPVdQVD4DWdV2p7YTGuLGV4cF8es1fzST2cyBACGZsyE9iVpfUUucrKcdGXM/51s6hhq egMr6CFO1qQGm4+AHizV3LV/8wGxfgQcHSDOA3DXgouVl3xtjV6R1J9yGkLnWefbqwxX Teyhblftmr8mXi/RC9ipgbAx9d6oLS1s82g7k53U7cnahZOu9mgSCkJHikS7mxeAIs5W Oq28+Ov2AGqMidWQ24OfdQ31FK2omNJ0T3w+bYs+uYqnw4Ucsaoyt2YQ+asajE0zYCNu pXQw== X-Gm-Message-State: AOAM533PoMN7hS1+/50+joHitG5ADWSv2r41qhmFJLPGKe4z7JNPOvqh hYZ0KJne1ea5ZL6sPOU7DhPaOK4Pa2Hwhg== X-Received: by 2002:a2e:7311:: with SMTP id o17mr1216300ljc.415.1623107076298; Mon, 07 Jun 2021 16:04:36 -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.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 16:04:35 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Jun 2021 01:03:49 +0200 Message-Id: <20210607230414.612-11-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 10/35] fftools: provide media type info for devices 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: Zk8aCJMbYFK+ fftools now print info about what media type(s), if any, are provided by sink and source avdevices. Furthermore, printing is done with av_log instead of printf as the latter doesn't handle characters in some device names correctly (e.g. "Microphone Array (Intel® Smart Sound Technology (Intel® SST))" is printed incorrectly). Signed-off-by: Diederick Niehorster --- fftools/cmdutils.c | 41 +++++++++++++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 4148285971..b7018b7dab 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -2205,9 +2205,36 @@ double get_rotation(AVStream *st) } #if CONFIG_AVDEVICE +static void print_device_list(AVDeviceInfoList *device_list) +{ + int i, error_level = av_log_get_level(); + // reset log level such that info messages are displayed + // we need to use av_log instead of printf as it handles + // unicode better + av_log_set_level(AV_LOG_INFO); + // print devices + for (i = 0; i < device_list->nb_devices; i++) { + av_log(NULL, AV_LOG_INFO, "%s %s [%s]", device_list->default_device == i ? "*" : " ", + device_list->devices[i]->device_name, device_list->devices[i]->device_description); + if (device_list->devices[i]->nb_media_types > 0 && device_list->devices[i]->media_types) { + const char* media_type = av_get_media_type_string(device_list->devices[i]->media_types[0]); + av_log(NULL, AV_LOG_INFO, " (%s", media_type ? media_type : "unknown"); + for (int i = 1; i < device_list->devices[i]->nb_media_types; ++i) { + media_type = av_get_media_type_string(device_list->devices[i]->media_types[i]); + av_log(NULL, AV_LOG_INFO, ", %s", media_type ? media_type : "unknown"); + } + av_log(NULL, AV_LOG_INFO, ")"); + } else { + av_log(NULL, AV_LOG_INFO, " (none)"); + } + av_log(NULL, AV_LOG_INFO, "\n"); + } + + av_log_set_level(error_level); +} static int print_device_sources(const AVInputFormat *fmt, AVDictionary *opts) { - int ret, i; + int ret; AVDeviceInfoList *device_list = NULL; if (!fmt || !fmt->priv_class || !AV_IS_INPUT_DEVICE(fmt->priv_class->category)) @@ -2225,10 +2252,7 @@ static int print_device_sources(const AVInputFormat *fmt, AVDictionary *opts) goto fail; } - for (i = 0; i < device_list->nb_devices; i++) { - printf("%s %s [%s]\n", device_list->default_device == i ? "*" : " ", - device_list->devices[i]->device_name, device_list->devices[i]->device_description); - } + print_device_list(device_list); fail: avdevice_free_list_devices(&device_list); @@ -2237,7 +2261,7 @@ static int print_device_sources(const AVInputFormat *fmt, AVDictionary *opts) static int print_device_sinks(const AVOutputFormat *fmt, AVDictionary *opts) { - int ret, i; + int ret; AVDeviceInfoList *device_list = NULL; if (!fmt || !fmt->priv_class || !AV_IS_OUTPUT_DEVICE(fmt->priv_class->category)) @@ -2255,10 +2279,7 @@ static int print_device_sinks(const AVOutputFormat *fmt, AVDictionary *opts) goto fail; } - for (i = 0; i < device_list->nb_devices; i++) { - printf("%s %s [%s]\n", device_list->default_device == i ? "*" : " ", - device_list->devices[i]->device_name, device_list->devices[i]->device_description); - } + print_device_list(device_list); fail: avdevice_free_list_devices(&device_list);