From patchwork Wed Dec 8 01:06:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 32151 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7047932iog; Tue, 7 Dec 2021 17:12:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJz+yx2MSngzs3rbYB9QmbNOf5ErDgZOhqb/8ODgYefp9kjO2qDlH2+L+4YT8pL0MfoWbP+P X-Received: by 2002:a17:907:c22:: with SMTP id ga34mr3458054ejc.217.1638925970653; Tue, 07 Dec 2021 17:12:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638925970; cv=none; d=google.com; s=arc-20160816; b=yCikFU9Zfuqag8XEZhnauwMqbilTSEU/zR1p3rZI8IjmED+doTCT2IIa2uv8pvwWY/ VO2msUYr2c4afSiTaaeTprc46ur6wjGv8W6kEiqMzeXgPqQR4KJjO392Za7zsoKIBdQl Cz6uybbcvUkM8u9U7hJ43jbUXHDvjSiNiYw0l8xqPO2Eqv+q4RZFtB/aFkJlJs3/pF8/ kQkmO2NcpsvYpam1g3eC7qndrVlNEiXrADo5DBN8X6vAglCbv8nVumI2NmmYrA8chqj+ oynHzl1ta8d4hxSzmTnc5R57Bck6fiG+Qth7GPbVHv1tD8AhsAKspbcwnT7mtiUx0Wa0 ZZ/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=umvvTTtSQZSlo5CKGhyeqHkOKO5SqgrC+tep2AErAGI=; b=C9rpeHuU2xkp32iyTLZq4taiT7JBetfSFeYlxOYetsVRWiOlMc3hY9d1hKWMzWu3CW QMsrDv2xj8L3wUc2qMVZTBr+CBJD2IO/CLpK0sf22gFycEn7p57ZqE1CS4aI+uauIpNA UOEo44VBWnABnFZIH7XGJ6LNcjE7BPjN6bDz7qSu0uNludOcPOJZIueGCQnQh/TL3mUs XbLpS1ThxiT1PiKceT06w8agtilAehUuxzWh1gFjLHdkI/7zc8Zxl5nlbu4WtuemAemj aAKlX5RA9Z6tKJF3sAS3mpF0aiIVpTsUebRBGeJaOP4ueaGtVBl1B4gN+quSNl5i9NNZ jDPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=BdXDdRP3; 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 j19si2680874edj.137.2021.12.07.17.12.50; Tue, 07 Dec 2021 17:12:50 -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=BdXDdRP3; 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 2C16768AF1C; Wed, 8 Dec 2021 03:08:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua1-f51.google.com (mail-ua1-f51.google.com [209.85.222.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA88D68AF6E for ; Wed, 8 Dec 2021 03:08:07 +0200 (EET) Received: by mail-ua1-f51.google.com with SMTP id l24so1954340uak.2 for ; Tue, 07 Dec 2021 17:08:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=uahLS5slZO31Ils5Z5jz3VL7IZJFGKdp1vH+exRWFNA=; b=BdXDdRP3uMOis1m2wThzdUm5kQ9eaafVMcVsBIdHWpfhJMgc8ZMSrHBpT5ZdxH3v01 jJ/ZM+bqc2D4NUcSRqDCVaJZ6Dw7bLeUta+7UiSXWMJdMzeYimbhTXF8hYEWKst4jD37 5PNSLYN9CiXT2omu6weoqGF3A7lQr2KQZBAlvRHiT2jovzELNFKKTBTGcTj7eQnzuuR2 BZTMQkM5nMcHJgN0ZgzmUvUC7eFfsdbDurgUzKB3uzFdwjcEJSw5VA0Xa3elb7h81ZqP ftefhGMEt6X7S38eJ+eIuStK80XvS/i0tsDELlHmw8zSYv5p54D1H8yULucWv20SkYzm vLRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uahLS5slZO31Ils5Z5jz3VL7IZJFGKdp1vH+exRWFNA=; b=f7ZMBrSo71HqG4jpP8jiwun+FirzwkXbDAAW6hFuqGeAb8rdGoRd8VBVj2OcY6Apc8 Gld+RMwAfvKa4PCsg3QdF8drvgKrew/iYcZAZpusU8fJvRukEtZixZm+N1t8byJc9FXA HglJ81ZGDwW/V/5b79fq6HPn3grsVjWL3l6VWJkl6e/Gm06nomLrAPnIH5eEs9we/rcm upEiASWLRV2hWrwuslN4apLSN6hXTsvcEwu8BnQJ3CiCOn4KYdKtxvu/MwOahS/uWkjw KwTBbeMtimrxdsB30cyv2ctuuNye85qSbqCzSPU94RJK+WfOCXq+n+NSjxGK7L1KHLob 0GDw== X-Gm-Message-State: AOAM533HU4AliDzD8tPMTGg2A7RG6a0LzLUVNry/n8o9aleJwvFOxl0l eRvMUjE7vjzYbjBeWvzvL/m931gMx4nprZ9h X-Received: by 2002:ab0:35e8:: with SMTP id w8mr4060309uau.31.1638925686343; Tue, 07 Dec 2021 17:08:06 -0800 (PST) Received: from localhost.localdomain ([181.170.250.138]) by smtp.gmail.com with ESMTPSA id b8sm949898vsl.19.2021.12.07.17.08.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Dec 2021 17:08:05 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Dec 2021 22:06:46 -0300 Message-Id: <20211208010649.381-31-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211208010649.381-1-jamrial@gmail.com> References: <20211208010649.381-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 276/279] ffprobe: convert to new channel layout-API 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: sz30qKB0VRJa Signed-off-by: James Almer --- fftools/ffprobe.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 0711e02922..52d3d26962 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2295,12 +2295,10 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream, if (s) print_str ("sample_fmt", s); else print_str_opt("sample_fmt", "unknown"); print_int("nb_samples", frame->nb_samples); - print_int("channels", frame->channels); - if (frame->channel_layout) { - av_bprint_clear(&pbuf); - av_bprint_channel_layout(&pbuf, frame->channels, - frame->channel_layout); - print_str ("channel_layout", pbuf.str); + print_int("channels", frame->ch_layout.nb_channels); + if (frame->ch_layout.order != AV_CHANNEL_ORDER_UNSPEC) { + av_channel_layout_describe(&frame->ch_layout, val_str, sizeof(val_str)); + print_str ("channel_layout", val_str); } else print_str_opt("channel_layout", "unknown"); break; @@ -2704,12 +2702,11 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id if (s) print_str ("sample_fmt", s); else print_str_opt("sample_fmt", "unknown"); print_val("sample_rate", par->sample_rate, unit_hertz_str); - print_int("channels", par->channels); + print_int("channels", par->ch_layout.nb_channels); - if (par->channel_layout) { - av_bprint_clear(&pbuf); - av_bprint_channel_layout(&pbuf, par->channels, par->channel_layout); - print_str ("channel_layout", pbuf.str); + if (par->ch_layout.order != AV_CHANNEL_ORDER_UNSPEC) { + av_channel_layout_describe(&par->ch_layout, val_str, sizeof(val_str)); + print_str ("channel_layout", val_str); } else { print_str_opt("channel_layout", "unknown"); }