From patchwork Thu Jan 13 01:57:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33408 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp30476iog; Wed, 12 Jan 2022 18:20:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJwnETItPlwbEDa+T2YKqEQ+uDCC8tHM/7BX7T41I0K9FNSq+BrRBQWtAfIjmDQlmDyC1cSh X-Received: by 2002:a17:906:dc92:: with SMTP id cs18mr1959433ejc.592.1642040455007; Wed, 12 Jan 2022 18:20:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040455; cv=none; d=google.com; s=arc-20160816; b=dc4divRMiynVgjlNXfKRJMgwhx59eLfM1b/QWxbbVGzMsRGKm+KwvXXuXFkHRnd1yI z9KYBPAiQA5rwxXXA2nKMURPjUHIMq4md+D3kA0dk3wPMSJ/MEfow821dYpxjbBWHV3F 1qZfyFtlRObfTxT7ePuTxrv93HHu5tn2FdKH/s9FZ1Tj7nRxN1roydhalDJT2KkAuA+Z DGwEsSBVGxGx9us1zOjkD3ZnGJCLUp+5MegxOeXVXugSMSSBK5kkdmuDokLtik+zwMes ISD3c0iwx8QO6lId2nWwI7gwNPtL9Vz+7Z6pRk3O96XcqooONa3rHjdipqMT3gnS8Kg6 RvgA== 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=cguWkUhDezbdnhtsGjGxllvvHDpLFPK6PuktK0q5D+s=; b=ycjN9xrMXFqyCMq3Hfm9y6mBiVg9pzjjG78UBjJGPWYUakrZdWX7iFd5rrxDYpXEJw CBn9bhor6T7NEx3+4avoISJiqZekvKsSM1QGtKUGxQsr3ZiNuyLhC63mHuonIBpvOAw9 +gzaGgFIGFHH6xai/BQBk8U4fMQ8qCYzsZkIHAlYC1Hkfmyzk8PnYxV7t44Ih9UGNVyq 3xsRC10t99bZ2V784NyHUPgs0US+7yBmYHTGPa9EVpXwUC1/26HYZqd47odrj0bKY4u1 tld3lMeO1p9gbKFfPpH8F9vJrT05B7VXakBrL+jRf23sRVm5tTyyPUz2BMiOJgWKnMIN VN3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=AHiLAwfX; 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 dm28si852459edb.411.2022.01.12.18.20.54; Wed, 12 Jan 2022 18:20:54 -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=AHiLAwfX; 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 8ADBD68B38B; Thu, 13 Jan 2022 03:58:48 +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 6882068B36B for ; Thu, 13 Jan 2022 03:58:43 +0200 (EET) Received: by mail-qt1-f182.google.com with SMTP id q14so5313650qtx.10 for ; Wed, 12 Jan 2022 17:58:43 -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=tPwyqmJdfvBYwDTpg9HC9wLIiHbEUc0jJMJ6FbeBZDk=; b=AHiLAwfX/RVXtB868nUhYIuDjeZ+prPC7cuOpCNdmI7TNVuKSCk9psIt64x01FunoC yDcacMcQkxQZtmssp5ByQe/ONrCTZVE6vpToq6/XcTWR26VNCFA8Pk6TzONWMezAX//B W57P7tK87gU2eS5SRfk6Dm9nT8SnkUNshf7QrTK++0KZQKAXM7jANyAGJsNuKOrItRdf C5ZT0goEjSbI2cixhW1aukxi/GqoTiw45u3ptYE8kusVmbi6ZIJ5ljAMGQpzMajyARvC BJ3I2gFBEHTvvKpr0s9EJKmUL68CtcU4GK4FoaOsaqt7MvzIgPtRJHGvuVrn8GxS44SU vvLg== 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=tPwyqmJdfvBYwDTpg9HC9wLIiHbEUc0jJMJ6FbeBZDk=; b=QRDILBx24qSudTKF3Ko9EoBKi859Ozlx6R2pgCjIZPY9g+5uDqAFBX2L9RdB3UiSvR mwCBRUriANgBuqLs7epDhIuEHSbVnoxOfGyArT0UFrhpu5AaaneXb2+UcEgX4tQQf+Ty OUnaSQ8J/XCvTCGMP3qWNTGQArdGYnrA8NzJ/k5S77Xn/tC0C5A3czWJr5w1pHJ7BddC nh7oRGvU7Bw9m2wNAQG5rE2pHPyMn6w1HzX4ZdVrlkUin9r45nDv9uYqxwMvt7dnza5R YcpEVV/Xwt6VLOKmmq6/is/2hSuyIf+/G0yiLB4SIiqrBbIIV2Q44+1IrTX/UJgX4xUc a9Fw== X-Gm-Message-State: AOAM532FVV52KzzBpoUuGqq58a7fB2yiaNeXw/dx66XqE0O0vI4MrNu5 pyyf9Gjwx2cyASTDT+jtfj+oLzANUkU= X-Received: by 2002:ac8:5a47:: with SMTP id o7mr1963199qta.613.1642039121786; Wed, 12 Jan 2022 17:58:41 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id u19sm893081qke.1.2022.01.12.17.58.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:58:41 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:57:49 -0300 Message-Id: <20220113015806.519-14-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 132/281] rpl: 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: tVj7dAd3laiD From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/rpl.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/rpl.c b/libavformat/rpl.c index 459791ffd3..b6eaaab768 100644 --- a/libavformat/rpl.c +++ b/libavformat/rpl.c @@ -194,23 +194,26 @@ static int rpl_read_header(AVFormatContext *s) audio_format = read_int(line, &endptr, &error); // audio format ID av_strlcpy(audio_codec, endptr, RPL_LINE_LENGTH); if (audio_format) { + int channels; ast = avformat_new_stream(s, NULL); if (!ast) return AVERROR(ENOMEM); ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; ast->codecpar->codec_tag = audio_format; ast->codecpar->sample_rate = read_line_and_int(pb, &error); // audio bitrate - ast->codecpar->channels = read_line_and_int(pb, &error); // number of audio channels + channels = read_line_and_int(pb, &error); // number of audio channels error |= read_line(pb, line, sizeof(line)); ast->codecpar->bits_per_coded_sample = read_int(line, &endptr, &error); // audio bits per sample av_strlcpy(audio_type, endptr, RPL_LINE_LENGTH); + ast->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + ast->codecpar->ch_layout.nb_channels = channels; // At least one sample uses 0 for ADPCM, which is really 4 bits // per sample. if (ast->codecpar->bits_per_coded_sample == 0) ast->codecpar->bits_per_coded_sample = 4; ast->codecpar->bit_rate = ast->codecpar->sample_rate * - (int64_t)ast->codecpar->channels; + (int64_t)ast->codecpar->ch_layout.nb_channels; if (ast->codecpar->bit_rate > INT64_MAX / ast->codecpar->bits_per_coded_sample) return AVERROR_INVALIDDATA; ast->codecpar->bit_rate *= ast->codecpar->bits_per_coded_sample;