From patchwork Thu Jan 13 01:55:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33384 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp26658iog; Wed, 12 Jan 2022 18:14:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJyW6DW/L0onWph0QtJhHGqhHfkgPDQrj1irNbDQTnQ+S54Dk4IwhXR5ISOpmwtUJVdHmX4q X-Received: by 2002:a17:907:1b11:: with SMTP id mp17mr1929510ejc.374.1642040087107; Wed, 12 Jan 2022 18:14:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040087; cv=none; d=google.com; s=arc-20160816; b=lW+yzRo1p5plerTpPnGgqKgZ6MYoloUUrq0WkKv7kduOMbUdqptMoVPa51rcPgFmYa 2QbrBcRtwuHAP3pvnuENxxIrwAOFDItRIUCttMgQBuOlRrEk3znbvkisO96WeW3bn4vJ 482fRIC5pB+RcqUPNqGuLfNbDoRj7OBU/Pee7j1IkwgQV+mEaqKl/nqItriGpg27qzI+ UCy6kBJVhxhuzpzAWqn8mcTaFcOYmtNqREMT3RizBnz/Bx5ZN9BdgAPQ3BvQzerV5IXx mH5BSWUUaRznQyvK3EFaKRFu6J6F8DYlPu9c5K1MLrjt/zaWVsE8KZieNhnoBbHEeJGB FlaA== 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=9AF3k3j6tx6TmR35ZKVrfYHsmS9tf7irbaZTmNOhuFA=; b=U1Ac6WN1g0i2FbXYUCUZ+7VYmGqxiuqF3tHe6opdhf2ocao04MlmnD15bgziaU7IiX WzI7toR5mL63TBeT4+WIJ4IZ2uHrbgl6pZci5Nl8XJdByNWmWlrtmcqA1gQ4alC/FFMZ Ohfj22f2axOi7E5QZnWZ+SoxANUuUHrecYmKrnz4TQ33HEKU0gL5VNfKnhDGftYGRnJP M/SYVl0h6rMyV45yEFZKzp7yPkMgOmVm08gcNNjYcEFN7kb/dSaCQKPheQW27t4pC/2s J9L9d4xLEFuQCRBvoM5JPfs2Yi3IXlUrGk+11f0Z8ax1zXs9CZwoT0usghxhaSclnSWD eG+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=RoF+QDoh; 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 cd8si708148ejb.566.2022.01.12.18.14.46; Wed, 12 Jan 2022 18:14:47 -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=RoF+QDoh; 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 636D168B2A8; Thu, 13 Jan 2022 03:56:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f43.google.com (mail-qv1-f43.google.com [209.85.219.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0BE8168B28A for ; Thu, 13 Jan 2022 03:56:45 +0200 (EET) Received: by mail-qv1-f43.google.com with SMTP id t7so5155038qvj.0 for ; Wed, 12 Jan 2022 17:56:45 -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=/Wi3WMmSSDQf81Leog9zJFyDeMOPnSu9PHQGboJM+BQ=; b=RoF+QDohdS4SQRk/T4hYc5Pyu5macROJgp6gKOPORpU83lsuntbElguDiZHcl8hELq vlfWoXDBCWnE/keuLQMcuNhtvgH4VvUMJT7YHXnofHSx2mf157ATLZYDJF5lAVY3O2EN 1qxNBZi+Hu36sWa4xtfiXEMdDGnGIkuJYtCfa7c1eBAuvlu9qXn8cYDPxHk7UbZtPwa0 9FIYc5wlcjktXv3ziARap4jNs3xWWGMFOBZPNa4EnoCd/wJPrth1Jp1ZRFHn6SBpx1xf a0CwsF0LN1k4aE3qWNHohyjEzLI3RFg2gx3CjZJS8g/oIUmjpbKOHlE+9MPrW+GgX/Bd CGxQ== 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=/Wi3WMmSSDQf81Leog9zJFyDeMOPnSu9PHQGboJM+BQ=; b=3yDly1UA6toL0EmV3xY9G3jVtWGazRUk5AGNZpgAS9OjoOoxyxC5ZkrQ3U3ipJ2N3y 2/2UiTqAI6U1F4yTUNCMhceHs8p4IG4RnwEeeoy9+U+H1ipesU1iM7xMDmQa+i2wvYNt DGGklEtSLEkI6HON0+MywIPogexT0s4/S19MMkLw8tZ8pU1Ga2IyBCWZETesM+QNJuVQ vLoyJZOQEO4x/t+faUHpbTbgKz7sw/uxEFOe6ZhpHfDq6VIgljopyzjr54brMBrBkZZF E3QpfiBwtyjMfL/zDbOisDm4MqnixSCMLucXt2LLQjsBcsOUkR9cHDK6e8mt1yeXXOz+ CEdA== X-Gm-Message-State: AOAM531bU3y0lw3bCgyBjwM7tbxMnMXfi46tr3FY5F7NmqQFj/TPbNQw AXZYlxS6shgHusg9brtNtMFwVJK+okY= X-Received: by 2002:a05:6214:509e:: with SMTP id kk30mr2200818qvb.61.1642039004627; Wed, 12 Jan 2022 17:56:44 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id t11sm906506qkm.77.2022.01.12.17.56.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:56:44 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:55:58 -0300 Message-Id: <20220113015612.448-17-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 105/281] mtaf: 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: Tla0fUt+/lPf From: Anton Khirnov Signed-off-by: James Almer --- libavformat/mtaf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/mtaf.c b/libavformat/mtaf.c index 5da82e713b..fcca684866 100644 --- a/libavformat/mtaf.c +++ b/libavformat/mtaf.c @@ -54,9 +54,10 @@ static int mtaf_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_ADPCM_MTAF; - st->codecpar->channels = 2 * stream_count; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = 2 * stream_count; st->codecpar->sample_rate = 48000; - st->codecpar->block_align = 0x110 * st->codecpar->channels / 2; + st->codecpar->block_align = 0x110 * st->codecpar->ch_layout.nb_channels / 2; avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); avio_seek(s->pb, 0x800, SEEK_SET);