From patchwork Wed Dec 8 01:06:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 32141 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7044313iog; Tue, 7 Dec 2021 17:09:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJzOvG65z2mGPtuq3ZBMXlA2Il7/7m7cm/Q5iioeqZff3fzZERfos4G2qMrjW9vcjohGa+07 X-Received: by 2002:a17:907:7b9b:: with SMTP id ne27mr3456277ejc.79.1638925746714; Tue, 07 Dec 2021 17:09:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638925746; cv=none; d=google.com; s=arc-20160816; b=dnLgNBV4++FDYijtXsEDJcoBHzNkitezLawp4oIbaKmODw3f5RBahhgXntRastmiYj iWnqc8SZw34R3fSAzG/IqBOmQDpcmdWxfpbyYq29rCLQvRx3HYD29ttwA/IJ7ozkyIYf Vkzh7Dr8cYTxfAuQylg0yw+hVP61cah9UyiaTcEnKWAcHRoVz4i0YhNAfnj1FiiK1FbT 5nvs7QHdYmyRgZfwILnyqfLe2P40xgfFigZ9DZzdbE4SoPngF38wefGbh5o35dlWAfhA TEJXavdp5sOBBOWFdQyCf2ocBk2vyMqB+ETArFdsBnsykT66n0LBib9wT5vNvhcd7akQ nAUw== 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=DTLE5eO9JE3G4LaVoaIDlrkk4cKx55kXEmom7r6D0Ho=; b=y4Qb6Sqm36Lv8xfqR3GD7ToQfktrNUGnVvD6cSqtgvJdGBavY1AmqpLbvrkqjnUeZc svDUnykuYcBsDlDRo2zqGr7MxsQZ6Gpfb/WJNVGhKMmBL4Qc0SfGwAxYk3piIDwgy5Kc LcfMfu6KhO83IALRO19E8corQLJkwI6N5b0j9qNDPOxGfQIu6rH9M6ue9GmXQjQ9+Dso dEKG26GdHCzEdARQRecEfMYlBZxcV4AhlrEFxwc6di80xM2H2VbUS0YLmh8AkGDriM9t qgVuo6l2dBja4xgPvnDTaZ/cQgOcif7SstB7s7cTV6Zf8bWQwbQ0MGSnjXA7aVQ/KNCW zEUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=M8vmi0+N; 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 l10si1628448ejz.697.2021.12.07.17.09.06; Tue, 07 Dec 2021 17:09:06 -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=M8vmi0+N; 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 418D368AE77; Wed, 8 Dec 2021 03:07:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua1-f43.google.com (mail-ua1-f43.google.com [209.85.222.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8850968AE6C for ; Wed, 8 Dec 2021 03:07:40 +0200 (EET) Received: by mail-ua1-f43.google.com with SMTP id 30so1830988uag.13 for ; Tue, 07 Dec 2021 17:07:40 -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=BVCK0GeOHyagtrPxYG/ArcICJBUIqMeOtgQVBcMRzRk=; b=M8vmi0+NXv15GRWVZOQF8QoqiGH2f63/f+Uzsru3FX3OiTQilwO4kjOUKrjAuo1EKq NlK0tmq8KVLcYG1O4Rds2ZdDYuIODHbGxooKOoTPEnsK0yrlX2uIpb/M1lpXcULZlsPt 6Ig7/rS37G4UXGXso4YpYqWX+EnDpaSf79JuIdyVR4kwUfBDztfpNJbP6eZTjWti5F0m UTXYvj5+g7K5ElCiYUyYnYy8TcPzpjENee9jufU00mJFcmCfJl6S/RrU8f399iQEkM7y Cp2mjjyvD6hP8L8ULC4OIKohHDTYs8d7uJr5EnQXW89Wi7VGP5d1FnPF0A3iPu0PN1Lc DrAw== 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=BVCK0GeOHyagtrPxYG/ArcICJBUIqMeOtgQVBcMRzRk=; b=rPOnmZvTv5u+kP61uv/lVkos0a0FvlCQSm/xmyXZ/abVUfGRFW4NS8+DWl2ugwCa7f m5Fm7Mk6DPAwczHNf83ulYG14/Dyuow+3tf38Mw6jA5vLxPiaazVjsAVi61jxXzT8p28 wmKnmLpPYe2VC7hNXqx/eAG4bahd7kcwmbqGs4rm+KLgDvocwaa/UtA5q1OFCrSV0jk0 6nF34Phnc7Ijeqo8mHhMlTESt3WCJ/5skceHCyZKP5009HFAiz8+BImJSwanpI8jDTv2 CfZGCTez97Xy5s6aRcM9eyqvVG4PHBaIdKOHItxsiEEskuxtw4vsmiNHy/zrvnBHiAJG 6wVg== X-Gm-Message-State: AOAM531los920tkPAdeDay5NDy+IFDNH0xDCDDpMzHD5wn5Fq/zCyyT5 klVi9iY6cqOuq5+xZRZLwXSfVzrHN1ezaF/J X-Received: by 2002:a67:edd7:: with SMTP id e23mr49820340vsp.52.1638925657276; Tue, 07 Dec 2021 17:07:37 -0800 (PST) Received: from localhost.localdomain ([181.170.250.138]) by smtp.gmail.com with ESMTPSA id b8sm949898vsl.19.2021.12.07.17.07.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Dec 2021 17:07:36 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Dec 2021 22:06:25 -0300 Message-Id: <20211208010649.381-10-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 009/279] 3dostr: 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: ZopKk07AkbFp From: Anton Khirnov Signed-off-by: James Almer --- libavformat/3dostr.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libavformat/3dostr.c b/libavformat/3dostr.c index 0c136c9ea0..9b6a4d1d86 100644 --- a/libavformat/3dostr.c +++ b/libavformat/3dostr.c @@ -102,15 +102,16 @@ static int threedostr_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->sample_rate = avio_rb32(s->pb); - st->codecpar->channels = avio_rb32(s->pb); - if (st->codecpar->channels <= 0 || st->codecpar->sample_rate <= 0) + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = avio_rb32(s->pb); + if (st->codecpar->ch_layout.nb_channels <= 0 || st->codecpar->sample_rate <= 0) return AVERROR_INVALIDDATA; codec = avio_rl32(s->pb); avio_skip(s->pb, 4); if (ctrl_size == 20 || ctrl_size == 3 || ctrl_size == -1) - st->duration = (avio_rb32(s->pb) - 1) / st->codecpar->channels; + st->duration = (avio_rb32(s->pb) - 1) / st->codecpar->ch_layout.nb_channels; else - st->duration = avio_rb32(s->pb) * 16 / st->codecpar->channels; + st->duration = avio_rb32(s->pb) * 16 / st->codecpar->ch_layout.nb_channels; size -= 56; found_shdr = 1; break; @@ -135,7 +136,7 @@ static int threedostr_read_header(AVFormatContext *s) switch (codec) { case MKTAG('S','D','X','2'): st->codecpar->codec_id = AV_CODEC_ID_SDX2_DPCM; - st->codecpar->block_align = 1 * st->codecpar->channels; + st->codecpar->block_align = 1 * st->codecpar->ch_layout.nb_channels; break; default: avpriv_request_sample(s, "codec %X", codec); @@ -178,7 +179,7 @@ static int threedostr_read_packet(AVFormatContext *s, AVPacket *pkt) ret = av_get_packet(s->pb, pkt, size); pkt->pos = pos; pkt->stream_index = 0; - pkt->duration = size / st->codecpar->channels; + pkt->duration = size / st->codecpar->ch_layout.nb_channels; return ret; default: av_log(s, AV_LOG_DEBUG, "skipping unknown chunk: %X\n", chunk);