From patchwork Thu Jan 13 01:56: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: 33393 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp27940iog; Wed, 12 Jan 2022 18:16:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJwQUP8mHM/8MKps2nivMoG+wPXbuxLnVhrjCi3hEnATRp9EhOdwUaJE8gZKWOFg+PClLlEr X-Received: by 2002:a05:6402:40cd:: with SMTP id z13mr2208922edb.257.1642040204392; Wed, 12 Jan 2022 18:16:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040204; cv=none; d=google.com; s=arc-20160816; b=T/vAMIEdN5E1hqcexjIZ+9jv23tHB8svpDhDLFpOau1NZCgUebiQstO2mfm63QdGzb S6zx/DLt7370zQ2w+NR+cSBEi6mEAVAtzyhRqAYDWOUKpKyMpiR9FB3gmoJObKJMrA+3 uZDyMLLm4WGMFNn8NPe1fO3FDDLJ8PscjEkRbRay347icKu3egz3UG8bNmgvbbru8HE8 hpB2wgHPm6BiPbdJW0cgRCpF6kpZQXSjBShFKf3fosJdIZskHFHkAUR4cPivyf5SQaCq IX3fXzzWtYyOPeb0FG1qfX/zIPbwlRM5kIZ+pHzfuwoECZfIHRHZaKramSe5i3QUqnNh W5cg== 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=CpNWp9le0h1jKQHPYTygGqg4+QUwrMX0jVELeyC2PVc=; b=cU/g9WFIEBHGSRrdbHzyIaq30zYnJ57Dpep7+rfZ/x2qEplwN+eh+/2dFk6gaPB9R+ um6pwWl3klompj/KOt1Rh2rw0AxkUC/UIH1KUDrG1O/o3GsqoFTAXI7MYdc36QtdWvni 5gwi+7FIOQ1UHJtfeB+500lEb//Vsr0QR/EkMk4hA1AN47FIkmhwcUxnrjVOkULxYSst rbUncPpDnV70BUfJ+HVzmD96RaOBe5IScM/RLa5CQgFPuct1xrktBU7h9GwU2uHhXSlo f9MJamiXd4jE40qDVGu2SEsD8YE+qFwpTkEBtP+fK84bcesRI6RH5PMQGHvg8C0epuVH AjGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=KT6D3zAm; 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 eg1si798799edb.616.2022.01.12.18.16.43; Wed, 12 Jan 2022 18:16:44 -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=KT6D3zAm; 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 4B1EC68B2F8; Thu, 13 Jan 2022 03:56:59 +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 DD04168B2D1 for ; Thu, 13 Jan 2022 03:56:56 +0200 (EET) Received: by mail-qv1-f41.google.com with SMTP id fo11so5078904qvb.4 for ; Wed, 12 Jan 2022 17:56:56 -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=xPKgTGxHqd9fWtM81g3mSy9+4WexDUP+//oCjRRLT1Y=; b=KT6D3zAmEwpf9oZKc+zLeEnNtryWUXh22ViVwXWKUzH2BPmStGvfSeOpMXX5F59ZFi cSmhr7FOiqGTaOwED22ow3nZAr67foqTytE9Um4hCkOUHZjqBTZnE4KbqHu7Ki1hyAOO qtFrftXa83GoRs1ZMcZs4hcEh6XCjA/UBfgdcqfktHyFwyvrgC3ZZaCGVJ6ilzKiqM3T n7LAjgJhdEdSQ+CbyTMDj6zVHT9DJ5a4zVIJnByz93Y89R1PUTbqJGtPludSLvy8329w 0wLBIFEpgtY86Xy9SYaz86TR8PPhXqTaNP8SoAH4feQUbGzb6P0BxEJL8i22EVrFKCe9 wvJw== 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=xPKgTGxHqd9fWtM81g3mSy9+4WexDUP+//oCjRRLT1Y=; b=8Fk7EMbzv3kxOiYJcR3fEdXTp8woorU9mp8kALa5vhqyQ7/pB70B0lTCGlwLjvtEsH E/CDIi46zZ4NFJPC2Bi86wuqIMnIadFaTfCTE4/mB7p0v85e00vjp+ri7BLN1nSId13f y2k+SyxLuzKyPBODlTxfCBO2bDj7LgEx+Q3HrNRs7k5NhcTGfjNPF8m5f5xTYfPRpk/B HLbcE7spYtNGhkUP44gdMqAueAMm7NkVo6Ib2dJG5PsH9GgY7F05updysKTgxiqO/esm iFQTZkUhdR+QDAVGWtn2JrVV4AnL3v9rfxvnvwzZyuvZDMGUUAAjhf8cSqbEGiyYjaxW hUow== X-Gm-Message-State: AOAM532I6x6wG13w4nZn7Py2BVTQUGYlDZKEKOc+LGjfE3TKrvDe3XMq s0R3yvle87JpMuZODJonXWd0mzXQhtc= X-Received: by 2002:ad4:5bac:: with SMTP id 12mr2447027qvq.20.1642039015497; Wed, 12 Jan 2022 17:56:55 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id t11sm906506qkm.77.2022.01.12.17.56.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:56:55 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:56:07 -0300 Message-Id: <20220113015612.448-26-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 114/281] nutdec: 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: J4QpFHAFaRHn From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/nutdec.c | 5 ++++- libavformat/nutenc.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 0a8a700acf..8beec503e2 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -453,7 +453,8 @@ static int decode_stream_header(NUTContext *nut) } else if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) { GET_V(st->codecpar->sample_rate, tmp > 0); ffio_read_varlen(bc); // samplerate_den - GET_V(st->codecpar->channels, tmp > 0); + GET_V(st->codecpar->ch_layout.nb_channels, tmp > 0); + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; } if (skip_reserved(bc, end) || ffio_get_checksum(bc)) { av_log(s, AV_LOG_ERROR, @@ -953,8 +954,10 @@ static int read_sm_data(AVFormatContext *s, AVIOContext *bc, AVPacket *pkt, int if (!dst) return AVERROR(ENOMEM); bytestream_put_le32(&dst, +#if FF_API_OLD_CHANNEL_LAYOUT AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT*(!!channels) + AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT*(!!channel_layout) + +#endif AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE*(!!sample_rate) + AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS*(!!(width|height)) ); diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 9d5eb4ed99..f88b424429 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -461,7 +461,7 @@ static int write_streamheader(AVFormatContext *avctx, AVIOContext *bc, case AVMEDIA_TYPE_AUDIO: put_v(bc, par->sample_rate); put_v(bc, 1); - put_v(bc, par->channels); + put_v(bc, par->ch_layout.nb_channels); break; case AVMEDIA_TYPE_VIDEO: put_v(bc, par->width);