From patchwork Tue Dec 21 12:12:37 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: 32787 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5361820iog; Tue, 21 Dec 2021 04:15:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJxE9WCt/10g2LeMazv64gBGGuht7ucn9tfEOpsnm536jgifovkVDg8Nmghs3vh3aTYdXJmc X-Received: by 2002:a17:907:1c13:: with SMTP id nc19mr2380881ejc.436.1640088911122; Tue, 21 Dec 2021 04:15:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640088911; cv=none; d=google.com; s=arc-20160816; b=Wev8Ppmnvxm6ov4sbJQaPUT/0qeqCafnAAbZmbsj6cGkyM1utpDTN8Q0QE5R/nlMas 5VXcxy8HHMTgqNYQt9JNaSozufNxk5jzJ1w358XtNfUDAZpg0IpPF+XAaFv8DVVAuU0L yNO0eNG5YP6WLOHv1tbAcnMkIZWmsUYHwBzvE6gSJxtDbfYKHh0hjHanVyet9TCcMg7A Jln/QNMdTSMqej1Nxul6BqA+jVEyeRlIf/ujNQg+Qt0UpxANwm1daHcdEmj+bh3mz42F lHYrNKDXynWZoRLLN/Vl3/xcr6uB25yUegRHvWJJRgoOzMcT/+a46kWnYHsIkQVd8hBC wpqQ== 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=VVZDiHHiulmLZ2DUouAOoRd6xOr1m6VopPl7GpLCVxI=; b=jQzEsihQz38Mbhm4iSqlS5x23gkP/ws7BmZBKFS3vZ9X8E7joKGZJrQkbWaykA1MdD e9thybDBSWl+0Uj6pJnOma/gnXfttf0xM06f7DDe5nrQSnc7cYI6nn7noJFI9JS2/jlf 6AkdWgL2N2pNJEMrJWcE9wUocMbGxsz+/ziRBQMCRK2F25c5f0L2ZsPCM7X/waJWr9lk n2kYFAN94IBF7gwNOTlbc2i2KY/pdv+FvQEGDEUF+nRZs9zroadktFlbHp/GQJkYw5bB ElXgA/JsVIZ6gwqXlfvUHgcXYglJUHdEDpLLPasTwPd2zQhLTt1pExgLOnTbWLNRylqe 9bPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=TkJmsZIQ; 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 l7si4633582edr.32.2021.12.21.04.15.01; Tue, 21 Dec 2021 04:15:11 -0800 (PST) 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=TkJmsZIQ; 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 20D8668AFF7; Tue, 21 Dec 2021 14:14:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C54DD68AEFF for ; Tue, 21 Dec 2021 14:13:59 +0200 (EET) Received: by mail-lf1-f45.google.com with SMTP id x7so4346318lfu.8 for ; Tue, 21 Dec 2021 04:13:59 -0800 (PST) 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=kMsh/cjRaeHZRA9EESMdY3i4MzhjOve1+S0jXjzgehM=; b=TkJmsZIQSyQDg5ZXiynoveVnMgue9YA/1alb9TOaCtpHzkl8yRVXUhoY0S42b63jbs dCLx6gjrEUGCVhzxdpW+lH+ztQtOUMJmYJ1VavfRoqaiKQPFsoKOCbk0ISQ6Uy7qKya3 750ta8bVT997kbLB9zVqzwBgdqK1yPgZ66kDiKpB6y5w9p18hOpkEMBdkl80Tvy0qboj 1VSuu7/9O3dDUfrNKf7LaH5IjYdHlrojKTRDLRyaaFmT+G7yh/FoVD2XzAugfMmsFT2N HIVxUZi39srcq83tr/L85BFHqhGxTg/xzt7jSrz1TDDZUzcx4go7TwLN2SOmhZeFvOvG VWAQ== 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=kMsh/cjRaeHZRA9EESMdY3i4MzhjOve1+S0jXjzgehM=; b=sYC3L/A97MIUDSr7XSDg3jX1Bbd174keL1dMbY8SDYRicdtCYXFgLNiGgYoRjGmX/P Zni3W4J0BmekiFxyGBoJYM7CQcZ3shBkLfDa5kSFDmhGlnT0HowipSoNWGdt7VVtCFFw j1XSdVtPqeSpi/cJqrCZldSGJ58fTVP2JJn/Vrn6HCOju+vvqe/jopOw+Sxovld8J0kR K0Y4vf6dFrXiHfOuK3kyIXqteHMyeoGlnWyX+80GSJ04zZHHfIKTEpKAqKt3rfjRoCNB zPSXUF5XHIQuFb5O/u3FWc4uWlYFA+ziQXIY91AdA9CcOMn7cbaxOGWkg8f8ZLZADaqM FiHw== X-Gm-Message-State: AOAM531Bx7eDprnBTdHMAOU+6soFlED728YYAjkzBZPZ4zUx+N0cIX3T x4PQ0QF5eVppqBS/5thVVlRuJckjSOBPng== X-Received: by 2002:ac2:4883:: with SMTP id x3mr2930063lfc.620.1640088839032; Tue, 21 Dec 2021 04:13:59 -0800 (PST) Received: from localhost.localdomain ([196.244.192.13]) by smtp.gmail.com with ESMTPSA id y4sm2728707ljp.16.2021.12.21.04.13.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 04:13:58 -0800 (PST) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Dec 2021 13:12:37 +0100 Message-Id: <20211221121239.1201-11-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20211221121239.1201-1-dcnieho@gmail.com> References: <20211221121239.1201-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 10/12] 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: Ltve/Nq96heC fftools now print info about what media type(s), if any, are provided by sink and source avdevices. Signed-off-by: Diederick Niehorster --- fftools/cmdutils.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 3c8e5a82cd..8b2dc030bc 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -2244,9 +2244,29 @@ double get_rotation(int32_t *displaymatrix) } #if CONFIG_AVDEVICE +static void print_device_list(const AVDeviceInfoList *device_list) +{ + // print devices + for (int i = 0; i < device_list->nb_devices; i++) { + const AVDeviceInfo *device = device_list->devices[i]; + printf("%c %s [%s] (", device_list->default_device == i ? '*' : ' ', + device->device_name, device->device_description); + if (device->nb_media_types > 0) { + for (int j = 0; j < device->nb_media_types; ++j) { + const char* media_type = av_get_media_type_string(device->media_types[j]); + if (j > 0) + printf(", "); + printf("%s", media_type ? media_type : "unknown"); + } + } else { + printf("none"); + } + printf(")\n"); + } +} 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)) @@ -2258,10 +2278,7 @@ static int print_device_sources(const AVInputFormat *fmt, AVDictionary *opts) goto fail; } - for (i = 0; i < device_list->nb_devices; i++) { - printf("%c %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); @@ -2270,7 +2287,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)) @@ -2282,10 +2299,7 @@ static int print_device_sinks(const AVOutputFormat *fmt, AVDictionary *opts) goto fail; } - for (i = 0; i < device_list->nb_devices; i++) { - printf("%c %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);