From patchwork Thu Jan 13 02:00:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33437 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp34078iog; Wed, 12 Jan 2022 18:27:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJwU+ctuB4IMrC01FuAVS1WEh0zYJ3gv/KUJIgrT1XXPKjW6nBGSwt6bZCcqdRsX9ZqFCdfY X-Received: by 2002:a17:907:d29:: with SMTP id gn41mr1895791ejc.538.1642040850687; Wed, 12 Jan 2022 18:27:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040850; cv=none; d=google.com; s=arc-20160816; b=e3nuAfsmPiusWub7OS77AMj6/07igLZVZTXwRwONP8mrGY1obyCMsjdB2DFih5tqQn IAH3AVrhx74wjFt0rAimxkr73DvPZ6dk1L8Rs/PYm9kQze2d0WcRl30Ib/+p/jXX0joV ZawYC95z9HO5KqvILsn8wXIZISYfwqRMTGdVggOF03RKbV6O6jK4ipzZi5RqeuK5fV6H C4piNZCwzWZQIxRQDoVC/tIABPVdTVLP1v3krldd0GB4b0gwaOaH0hi1t9l3IySfTPxt pe8DLu/z1m/I3zZ/PPp0uniOUpiABDIu34U8+H+KvJJ3UG5VhjgZX+4jXJYlIQQsfXxr Hu/g== 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=Pl59xfQtvvivSOWVzg9x/EbzqcyX0CEPg5Es2cApg60=; b=g1Aq4jXKqUoCNe5+J/r3il/fDFKpEq+12Tcqba+onIRsrfU/REfXJLMZZR4pgh4YqA RhpFOiaSP97tN1dc2AzJzzWmi5JwYbAJ1sccbzsFUCDB1M2BrZ2cz4ueSeRCsApAUUiB xF9gLyyKiJq5eISX74ejIYjgZt7XHVNzC08LegJ9aINbP2u1MmV6dqWRSzdnYJqnMxhE DRqGTlkMG1payeH36/33z0xWwVd/SswEGz+Ny+m/LhrtLD0JU5CVlND6hLKhLZVv9RJH 9a0gWn26N7kqqKuh6GmDX33oo4Fz/gcnZ7IytAumQUUqrc1GAXlN+6jcPZF9xT3x/LIs btgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=MqgfGPHR; 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 d10si839887ejm.131.2022.01.12.18.27.30; Wed, 12 Jan 2022 18:27:30 -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=MqgfGPHR; 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 6F99768B4B4; Thu, 13 Jan 2022 04:01:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C8A068B470 for ; Thu, 13 Jan 2022 04:01:17 +0200 (EET) Received: by mail-qt1-f182.google.com with SMTP id bp39so5318114qtb.6 for ; Wed, 12 Jan 2022 18:01:17 -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=PmWVXOPL3bnyPuFH8fpu35r8fIxDv5TsAck/mjSqdxE=; b=MqgfGPHRkzHsuNTK2oucEKVcvwm+oia171FX6wKaPLU8KCZfbr99G3M6zNcu5ZUe1e 977f8GrUz96mbbaTOb15js0WNnTO18RhiEpOe7YJOAw7rEjhVm/sffDvACnpR23AND1A QbB2yXi2zPEmc4oqirNZZPiRoOGjMuOdhcKTDqsiUVtH6y7Qyp94ew/fZCY5ugDCVPvY IaKV3T8HwoDLRBc0NW8c4s280rCrHuQwZX8RiknuuUQR96hx3m0QLs9MRxWluSXyi3Nh M0462Tq/ptIa5q53L9gqEWJPdHxIDwy16dcAAy2geitqAoyl93OFah87X8u1vjc/0KZm 2d9w== 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=PmWVXOPL3bnyPuFH8fpu35r8fIxDv5TsAck/mjSqdxE=; b=Kllr9Dc8ufiBGxYRO9WSAU9Tlc5VtSQtXslu0Y0uTPmnvPPzc8tVp8PbFRLMZlh4PL wjvtUul+TsA6YPebadC4THJU/mntOXsIgpGmCrjhDox6EfNJT2Zz/U7WFO7nsVQNMsMx LUna8huFOa+EvCxtOx+S5cZnDw3MblQj5iXG67dmDY6umhHC9eYQfnApn+6JM2nQeJvJ 7HIrqw4mNPmuodL0y43TRlPW1q9s0SsZwwnEOFpQK1AmUD3xpF/uCKksmVoiRUni/iv3 UoT7doX/cxh1gcLoH3Ta0IefDRnpVpGKNdssk1AlnOk01TV5rciVuRNxLaIpyTMnDqfO UjnQ== X-Gm-Message-State: AOAM532T9GmM/m/NlE3a9owO+BA1P1ynkgm2o/ZLTwSagH+WzVuy9kTy QrVWnBOkTwPiPTkoQUpYAuqqfLz5FHs= X-Received: by 2002:a05:622a:1055:: with SMTP id f21mr1972241qte.421.1642039275918; Wed, 12 Jan 2022 18:01:15 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y17sm1182232qtj.75.2022.01.12.18.01.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:01:15 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:00:06 -0300 Message-Id: <20220113020026.590-11-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 159/281] tta: 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: LWOq6L+nspUO From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: Anton Khirnov Signed-off-by: James Almer --- libavformat/tta.c | 3 ++- libavformat/ttaenc.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/tta.c b/libavformat/tta.c index 6de8c620a6..d2be9548b8 100644 --- a/libavformat/tta.c +++ b/libavformat/tta.c @@ -134,7 +134,8 @@ static int tta_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_TTA; - st->codecpar->channels = channels; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = channels; st->codecpar->sample_rate = samplerate; st->codecpar->bits_per_coded_sample = bps; diff --git a/libavformat/ttaenc.c b/libavformat/ttaenc.c index 486f8bdd10..1938582bb3 100644 --- a/libavformat/ttaenc.c +++ b/libavformat/ttaenc.c @@ -82,7 +82,7 @@ static int tta_write_header(AVFormatContext *s) ffio_init_checksum(tta->seek_table, ff_crcEDB88320_update, UINT32_MAX); avio_write(s->pb, "TTA1", 4); avio_wl16(s->pb, par->extradata ? AV_RL16(par->extradata + 4) : 1); - avio_wl16(s->pb, par->channels); + avio_wl16(s->pb, par->ch_layout.nb_channels); avio_wl16(s->pb, par->bits_per_raw_sample); avio_wl32(s->pb, par->sample_rate);