From patchwork Thu Jan 13 01:56:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33391 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp27688iog; Wed, 12 Jan 2022 18:16:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJzQ8+Vh30KTfZYcOKoHeGMd2zN+zeuV4+OkQEl0Blby6jRvC5LMckcfZ7hIIqz4VcJ/1a80 X-Received: by 2002:a17:906:33d7:: with SMTP id w23mr1841505eja.471.1642040176937; Wed, 12 Jan 2022 18:16:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040176; cv=none; d=google.com; s=arc-20160816; b=XOq1N/4WIAqS8KE75sE/rmdL/VBNXjvsgTwt1OALA9IktnYIVlJ/qw9dXYZ1P+nQj7 2EBb3J6ZgiVVW250BkMc/UKTVJNDf8YkEbCFmwVAoROxyEhWm+vsSBraIEPgRv7zxtNT kttMYr7Npqx0cxqL2gpSYlLeV3LtxBWl/C2T4FTfziozgAKZaXErMDzeVhWW8+z4XfIP pLLoZWodNSE4gv8h7jLuk+jJhU5tsj61e2nGhBcY0M9swIrmTdw6xrZRwgB55fVHTEd4 /unMkSUPmOXf6q4EPgw513I9anr+hIex7n5IECKczvC8vPieUihJ4LEaHKQvfFpg5Q3k gjnw== 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=ITIqPkq5gAK+RwyqurV2R1nOvn8Gm5etrybmGp8HjSo=; b=qMebsGMxvr9bWnBiIDotWebrGNNy178bwtVUf1MfOw7M2QnL2O59CAe6UvmrQFgaDB T0TrtqMP7r02zUyugTKb/bJwWQpswcXRiPYUqt5Gl5u/YQFU5a0RDHv5+0QR1CLhepcJ UUEA23ClFttDZd2sRZQAkI+MfDdXt/U9ajWh9tmdnWyBKQizrcNyAJGCA6mOgrsuQLkX wzyyNIMdyAK4nWmb26ttglWFmmT3Um8TDZYMV3+24XUBJgA5bsY4S9rN52ugRA9pHQdk rEaMktYDnbdyCSxPpKpft1c0VqeW7033EuZgDT+JVR/wwDZvLUCZ8UZwtlvgmT8yAi62 yJtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=YIQF+00i; 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 hc10si871133ejc.385.2022.01.12.18.16.16; Wed, 12 Jan 2022 18:16:16 -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=YIQF+00i; 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 8892668B2E6; Thu, 13 Jan 2022 03:56:57 +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 7D0A768B2B5 for ; Thu, 13 Jan 2022 03:56:54 +0200 (EET) Received: by mail-qt1-f182.google.com with SMTP id h15so963500qtx.0 for ; Wed, 12 Jan 2022 17:56:54 -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=+A1YoNnoVD/ZM8IuhSxC5eDBqmsM/Fz3QlgmLtHTpyo=; b=YIQF+00iZehUTGtcpIRaBxIISzZUaSBOzFTwfWTPMBdwhdOnPY7N5k5oOnP9Ytbtyq GxrOue+qFdJexu3VOkq5goiRj5hwGaoZ/4nmpAFeRuPQdGLJnv6w5RiSfGWbW9BQznTJ LfSA7txNDtAFr2h3JoFlA6JhCSVdCqXluOxpK1jRAA2orjznBLALV7e2y06Ws3Wl/TOC 9HtH7/5i89cO6MQVHo0W3ckM827zsDGdUd5t48gV3HJyyogiDCxzrRGnPxwBzbEFEwP5 0yEJgQ0W+SQKakKiIHlH5X/X2AC0IBoDhjdD4GWBFawROFj886PykgDkUBYZG6I66zJs 7m9w== 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=+A1YoNnoVD/ZM8IuhSxC5eDBqmsM/Fz3QlgmLtHTpyo=; b=6yff4N3G3DHQl+rsC+yuSCyg7BwSLktGJ84nIkqGkKY8kz4+6/AYx19kziolc4vbZq m6SLBYeHSoAKsnDPCr09wurEOjqYcLzTwPn7r2mchxDnN+RL1G4HnL629U6wR1Zdmm7s k0znFwIMnpZLXvnVqIZMP4UCM5X4GPvEGADS/S8qQIJ5668mxWm0gzoHsbeSY02Tv4L2 8l6qd1/wFR82kXpvOuMUI8CZC+JEYIFo71pO7X2BjZ5t1Cn/Y+vY/mY0qj6VCsAy1x8o kR6vsWYLwBeXKqN2w1R7x3Qa16hNIPd7KV0LVU3KJjWx2m2ncB8vcS8f13Dv7WTc2LKM 2psw== X-Gm-Message-State: AOAM532zvAyxypBpa3u7F5nlVzaB9NgrSEO56k7ePCALTGL6HY3kZBE+ blYA6uyESEmZ7+HmiEBz5SD/OgyD01s= X-Received: by 2002:ac8:5986:: with SMTP id e6mr1972064qte.519.1642039013089; Wed, 12 Jan 2022 17:56:53 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id t11sm906506qkm.77.2022.01.12.17.56.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:56:52 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:56:05 -0300 Message-Id: <20220113015612.448-24-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 112/281] nspdec: 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: k1I7Su1G6lNw From: Anton Khirnov Signed-off-by: James Almer --- libavformat/nspdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/nspdec.c b/libavformat/nspdec.c index 3aaf887746..8d221efea9 100644 --- a/libavformat/nspdec.c +++ b/libavformat/nspdec.c @@ -88,7 +88,8 @@ static int nsp_read_header(AVFormatContext *s) } st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; - st->codecpar->channels = channels; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = channels; st->codecpar->sample_rate = rate; st->codecpar->codec_id = AV_CODEC_ID_PCM_S16LE; st->codecpar->block_align = 2 * channels;