From patchwork Thu Jan 13 01:50:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33326 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp16751iog; Wed, 12 Jan 2022 18:00:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJxoGqjceNJBn0EpLXLo6tLRSAqJUsD/zcXtSUf5GM6MxT6r+ppy+0QHyOciglXAFc1aj7Ah X-Received: by 2002:a17:906:b044:: with SMTP id bj4mr1807321ejb.467.1642039228363; Wed, 12 Jan 2022 18:00:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039228; cv=none; d=google.com; s=arc-20160816; b=ylX7R7PZ/p2XcIc3eL5Wmmx3pA/bn89f9zlwc05jtTQ+L/+bf0gBqAL0x0VMnxYko6 C/mDTuV1PNwMFYxcwv6OQjyC3yiHXAl7AkRb9lBwsE/13QdQnqU7YqlNM/UdvmoGiVer u/O2FnP/SrdAa/ahpnKvp6xT8MtBDzFbmHuH+X6LVUfcenajyjPPGQzsmlhmwHtR1OvB KaZxQPlGFgvRyJfwrrwlDlsHm2QnvdGCf4SZXDKbE8yFGCfBwBb5CAknlhZVoOI7SUoN 8bqZf/oXJGkEcf7AL5iqOYAOWgUOX0RymHZ+UvBA7rt7c3RvlVY3UydYCYCM8nDS/YJK p3jw== 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=qI9jyme1jLqSZrMIY0+ryOzj7H5GMSxyXRe0/udeSj4=; b=tntIuQ44QSxikx4Gp10PqZ68khywq3zdJMnyxIi9Wc2GyJwK1OOWTwoXkWhPQ5MBaS kwqAomRmlTt4pRd0by/KG9ZmuVGZX0q3vTgO/MeT1KOijqpz1yNpJyULK1fd0VLGwsiw U3vmgEqRUtDfCRzGXy6EbBflTK+Wc5XrGKYE7leL+5WM+r97hZsELdIF/f/lq0ggAfag yN5CVaOmO4Qdqf5zj/Zba8MLzNwNXgdkwgRCDTAwR4RwEJP9TBGuGLYEuMehCwAqbVEs 9ub+qOdUEoIjgNsNT47eq38ljoidzq2bhqSxZQIZwqY4JT8ctzkbe6pNtvT1zELoIKy/ lehA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=S9P3PdDl; 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 e6si819110edm.323.2022.01.12.18.00.28; Wed, 12 Jan 2022 18:00:28 -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=S9P3PdDl; 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 7663968B09E; Thu, 13 Jan 2022 03:52:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AFD6668B074 for ; Thu, 13 Jan 2022 03:52:55 +0200 (EET) Received: by mail-qv1-f41.google.com with SMTP id a8so5144889qvx.2 for ; Wed, 12 Jan 2022 17:52:55 -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=JswVeWRDDxrXSLcrvKtS/jk50bViUH5zOGomTm4ID1g=; b=S9P3PdDl7Hvcb9kXc/7lQPdQBPPE6rDjfnA1z4ns11BYxzRSJ1EdasfPhFU/RQiYNa iKXvFCVkdReR8oJE+6mQAQMkFUvJb0a1gEnOa7BFSlPR32xRcQPm7BCM7Cpxyaz1zW+g Bt1u1jo2AzQfuC3doT4N/fBHd83xO7hECs+uGwvqUw/T/wbcRiMoBlu7a0YERorQ1/8l oTp0qFg/FCQ9hBTXaJNRp8YWSZyPLni8ht6k5w/G0FpavIyhX3xUHr4FYU/MJsNwM0Az mxkKAHCWkObDwdhte3jUgmt69jYXLKC4tcjWHj9ZaSuA446cPj1w9lf5YnaloA5WlUED y5iA== 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=JswVeWRDDxrXSLcrvKtS/jk50bViUH5zOGomTm4ID1g=; b=8CYtvd4aKe6VzSmmnNCaJ95QrujwhIapI7xTKZVXO9tlzIYvoJ6vDySH+uTYoa/ZyZ GJDYFpmt2nBzGK8HRc9LEj/6GOtj/zxPrCS5XYGH6+eRekEXdqDQj2dGTsS/8xm8G4ol 2wOpU+smiWKHW9YKiDA38ms7q+PNjVf7FFX8uCRV1hJwWex+5ho0W6qLeu8xDATZ94eS XiU2RC/bKBU8+D+AkZFZgN5un1kbUWIS4grlPg8/+xbglOPotFC/7XKx5OCI9nNzEqFu PsnhwvnQZfJjntwDrZrzOwo2uS9l7zH9BNDXN8bl9iSk8Tw2bgZqynijT7lNhbDmLWmv vIpg== X-Gm-Message-State: AOAM532is/oOoiZ3Ma6mYrVJ7/hFThhw3kmbqDiANCFZrD2qyAToh98C rvD/C5DLIByZlJtClkb8z9NKSUcUBwo= X-Received: by 2002:ad4:5967:: with SMTP id eq7mr783256qvb.106.1642038774280; Wed, 12 Jan 2022 17:52:54 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:53 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:50:07 -0300 Message-Id: <20220113015101.4-46-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220113015101.4-1-jamrial@gmail.com> References: <20220113015101.4-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 045/281] dash: 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: L43yGISRTOSi From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/dashenc.c | 2 +- libavformat/dauddec.c | 3 +-- libavformat/daudenc.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 4709bc6615..9a97838f5c 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -859,7 +859,7 @@ static int write_adaptation_set(AVFormatContext *s, AVIOContext *out, int as_ind avio_printf(out, "\t\t\t\n", i, os->format_name, os->codec_str, bandwidth_str, s->streams[i]->codecpar->sample_rate); avio_printf(out, "\t\t\t\t\n", - s->streams[i]->codecpar->channels); + s->streams[i]->codecpar->ch_layout.nb_channels); } if (!final && c->write_prft && os->producer_reference_time_str[0]) { avio_printf(out, "\t\t\t\t\n", diff --git a/libavformat/dauddec.c b/libavformat/dauddec.c index 6a5962c238..dbbd39a3b4 100644 --- a/libavformat/dauddec.c +++ b/libavformat/dauddec.c @@ -29,8 +29,7 @@ static int daud_header(AVFormatContext *s) { st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_PCM_S24DAUD; st->codecpar->codec_tag = MKTAG('d', 'a', 'u', 'd'); - st->codecpar->channels = 6; - st->codecpar->channel_layout = AV_CH_LAYOUT_5POINT1; + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT1; st->codecpar->sample_rate = 96000; st->codecpar->bit_rate = 3 * 6 * 96000 * 8; st->codecpar->block_align = 3 * 6; diff --git a/libavformat/daudenc.c b/libavformat/daudenc.c index 183a08ba30..2e252449e9 100644 --- a/libavformat/daudenc.c +++ b/libavformat/daudenc.c @@ -24,7 +24,7 @@ static int daud_init(struct AVFormatContext *s) { AVCodecParameters *par = s->streams[0]->codecpar; - if (par->channels!=6 || par->sample_rate!=96000) + if (par->ch_layout.nb_channels != 6 || par->sample_rate != 96000) return AVERROR(EINVAL); return 0; }