From patchwork Thu Jan 13 01:49:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33555 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6214:122d:0:0:0:0 with SMTP id p13csp989880qvv; Wed, 12 Jan 2022 17:59:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJyjOrwgGlZvEBLdX4w7pSfQbMitUpqJ0vSBZ8VmAecEB5gQFTIt6LwAZ/564WLVUQvvNnuZ X-Received: by 2002:a17:906:3a59:: with SMTP id a25mr1878640ejf.762.1642039172740; Wed, 12 Jan 2022 17:59:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039172; cv=none; d=google.com; s=arc-20160816; b=YNVMIGEVCiqJH5HMFoxfweG6XjK24g4LDAlja8qZ+sfbjZcSURSUOtNRreTV/Aa8Gg dohH9ohpZR73iGyNS0MM23SAimWxMOQnlxlVKfVp3ShOT1NiSVctxw/f81bFSAh6Ryq9 kyjkTf7f3z7dey3iwBiahNGZBKodUqy5j8u3485y1lIVqZDUaz14BdlEyWlyx+LpWyUx ajv9BBntf9zMEe28pom+4QGOZyZ5n2MFguzY5kh8V4aPfNAadzyssp6e344RHB9IUIz7 HeYMSHK/LH7tG9onOHr3Nj3ruepvfLX8LmRvVNPtjigaiJj47uezKayCNmhnyU4vsPit LUxA== 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=DLUkPhgXjJtZx5/07vSfKWgUZenaZPuBvSMEdCfDKj0=; b=m7QmcrXhPzR69RFtwE/9HxJPOQelGIMGI5X93aa8lzStrl8/pLCDDyy/tRS1Z1vgRd uvkJtUEpfbNdRQcVTRL0YnKd47mxpV9pVVp84sacmGRcwvw6YQFVwnFiMD0YYh+JgQWx lha4uovhwlfJhUZ5Tm/Ls2wVLx+7ySGVvy3N81AnKyvBymINJBeX10f6f4kyKSn+2m2P PpVr6hVemSa/V9hmqjY3ebEROl2gQjK6wNnmNWQ1sYeyuEYbXoHbOxEFXG8+9jRWcbMd 9KU17Ba9IdOQAmCuFQxC2qrcQnPPGTT8yVd7SNCiZJSvLz1r01yFj80qrT7FS4N1sFM+ Oj8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=mGZYZrwS; 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 qa16si750953ejc.238.2022.01.12.17.59.32; Wed, 12 Jan 2022 17:59:32 -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=mGZYZrwS; 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 8B44168B07B; Thu, 13 Jan 2022 03:52:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f52.google.com (mail-qv1-f52.google.com [209.85.219.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5AD6268B03C for ; Thu, 13 Jan 2022 03:52:46 +0200 (EET) Received: by mail-qv1-f52.google.com with SMTP id p12so5080516qvj.6 for ; Wed, 12 Jan 2022 17:52:46 -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=hb3hm8lT4Ofnhm5y4sgpqIAweZr5zHgYT1AlUWxiRtc=; b=mGZYZrwStT2/oE15SSF2lbqaiqrZrvj9uAMpVNTIxbm5Kwst5XZ8ZKv0jC9Vo5mUaP 7YFROUJApKZ78kWGOtnsq/HEEK59XiknZCpb4s9+sMXncz4p0WBjsQP9rpa5hSqQhbQ7 oviXdBwhh5H8wFDxoeT7XT76qtehYzk38zK95/Rg6ED5bP5JxXeUBBMLFWrmz65XjPqr EuUyssl1+5K2Tc6F4ee4jSDRzIREOfjRXQacUnXRbN42vKJa1df6U1Y00Pn3FBux8Kgx INEA3mkqVy8m+lP1mU+Cx+IV6LOHue77XOHaXXnY6YZMNQK0lW2bFkVmrUo5ZCcVYkBJ tMXA== 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=hb3hm8lT4Ofnhm5y4sgpqIAweZr5zHgYT1AlUWxiRtc=; b=qPbv/LK0yr5fUrnE1BnRQrvXRBiMhgOo3h12NKbRy36qYvHqyOW+wkxdkkYm28NGaq cAfoWbidhck4n4kpobQG/b+w0Yyv7bOjZ1SStuOSppXIc9rBAuoAMQg7L5mpZrMAz11g j9UeL6tTzFpSH45aKuaVBTGjtAvRfcka0qaFbJEg8gmi8MXo3LY6ZQjiMZzV0OR2D39q OwRuTvWAJSA6XL0YLzfAZmCSRx5+ZeyU12LssthtrLGb5QA4lJxh++FPVPbFqFqn0HAX eLbPsskxNenh/bPGh1gulDsdP1f14QqCTXwV2ngU9Nb8CwzxHmELXFxru8+iNZm8Lz+i P1Ag== X-Gm-Message-State: AOAM530KMynnoa1Z/k23BCgDx+lQOFRO0xWUPzl+H5fsTgOoRhuYttdg lpU8NhoT5fYpPzLbNuyv7dak/ytifg8= X-Received: by 2002:ad4:4a63:: with SMTP id cn3mr1255672qvb.23.1642038764641; Wed, 12 Jan 2022 17:52:44 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:44 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:49:59 -0300 Message-Id: <20220113015101.4-38-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 037/281] bink: 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: 7rS+Vwq43S1Y Content-Length: 2609 From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/bink.c | 8 +++----- libavformat/binka.c | 3 ++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/libavformat/bink.c b/libavformat/bink.c index 6627a17e71..4f413bd986 100644 --- a/libavformat/bink.c +++ b/libavformat/bink.c @@ -186,11 +186,9 @@ static int read_header(AVFormatContext *s) ast->codecpar->codec_id = flags & BINK_AUD_USEDCT ? AV_CODEC_ID_BINKAUDIO_DCT : AV_CODEC_ID_BINKAUDIO_RDFT; if (flags & BINK_AUD_STEREO) { - ast->codecpar->channels = 2; - ast->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; + ast->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO; } else { - ast->codecpar->channels = 1; - ast->codecpar->channel_layout = AV_CH_LAYOUT_MONO; + ast->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO; } if ((ret = ff_alloc_extradata(ast->codecpar, 4)) < 0) return ret; @@ -283,7 +281,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) (in bytes). We use this value to calculate the audio PTS */ if (pkt->size >= 4) bink->audio_pts[bink->current_track -1] += - AV_RL32(pkt->data) / (2 * s->streams[bink->current_track]->codecpar->channels); + AV_RL32(pkt->data) / (2 * s->streams[bink->current_track]->codecpar->ch_layout.nb_channels); return 0; } else { avio_skip(pb, audio_size); diff --git a/libavformat/binka.c b/libavformat/binka.c index d4cfee0368..babd5e240a 100644 --- a/libavformat/binka.c +++ b/libavformat/binka.c @@ -44,7 +44,8 @@ static int binka_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_BINKAUDIO_DCT; - st->codecpar->channels = avio_r8(pb); + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = avio_r8(pb); st->codecpar->sample_rate = avio_rl16(pb); st->duration = avio_rl32(pb);