From patchwork Thu Jan 13 01:57:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33407 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp30262iog; Wed, 12 Jan 2022 18:20:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJy0LCvMbhKsjXxvdPZRIG5wWF+8r/NcxDQ2NTJo0QvUI9rO+mEsBSU5M45RuFJsw85IypSI X-Received: by 2002:a05:6402:10c8:: with SMTP id p8mr2222650edu.219.1642040442236; Wed, 12 Jan 2022 18:20:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040442; cv=none; d=google.com; s=arc-20160816; b=TjVOhbn88Ug5yK6cTXNu27+UVDvbNE7C9BMWyQU9wwUgw3jLqYsbu+d15Geg1YZQ3F zRw2zcoH2B5Jw1nccOa7mrrU/VeYQ1nB0kaGBj3HEazQwHaCvXBXhwroxKoRDeXGt54j lhxTuedg0cEzz6EsjhH4UpvNMULBhgdakXGKkx4rxaNzp9EECVZPhhSutSzFZP1BKqD5 9VR75cubFU79romsmHvdj1r3gShwMgwhZY2efHxUnAXLeERYlxmuJTZI+IrCXwW8y8KQ kQcVUxT+0CCvqz7nEMmjDoB+AMy8G/aFuXrASx4HRoAJ6evfJms5X/ZFwyMiuS3Vj+tO ycJw== 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=+A4PhMWYLrNITczJLi2PzEfy4SOp2ikaPVBkDWEtTA4=; b=dVxjJTl3CmKOy6U8yCCs4MDpGD2TRdOYGgvANKoNfjL/pQgpxs3rnHuwAt+F7NEH1D rxCxbL0pPQGC+14dV03Z1Phe/Pf9OFwMMleLLfEdmJD+1UMeKmUAMd95qE5pmyIQgD40 5XlQ3SwNinulfALWfhe9wJX7/4HDRfcV/vpyF+EtGjtkDv9dKi6+CZ4S6wvPadX3Up5P saTwYAoDDVJFn2dxsJaGV49t4mHhVN0A7zaGjUf6dmp3sWm1cte3gNE6Nrp2EhDGyUEe /eYHQ5+wwKAYjVgbfz+o+2gelNrCkbVS416phLQyq8O9oovgy4+vAAN0SomDw66ZByAs DSAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=OvhZgrKL; 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 kx3si819351ejc.113.2022.01.12.18.20.41; Wed, 12 Jan 2022 18:20:42 -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=OvhZgrKL; 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 B1EE468B35E; Thu, 13 Jan 2022 03:58:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 26BC668B35D for ; Thu, 13 Jan 2022 03:58:42 +0200 (EET) Received: by mail-qt1-f176.google.com with SMTP id b14so2424334qtb.12 for ; Wed, 12 Jan 2022 17:58:42 -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=Pm2/wbYm/15QOw+WSiycgHfN7KMIGtff1jHn0IvoOd4=; b=OvhZgrKLb53m5knt/QVszZ3lnLhAZQaw21VRnejnCJ/S+uBh67fw4uVhtRj3DWaFNz REomWBgahpDvsBDlfh3aj+HhdiAkvGjajB48PHNxZzw+YiW4Yz+k382/2wu7KQAIe9/b L0u/EzSUy0qDhErLhlTaxz2awAes0CBaw5pvymfcukmxWX/7tI1K2Ugn2LuVllvDBI3Z OeHc7K1jKEXS+W/XQRCRzKIW1DBm5FqLtRBELkPa1HTh/9V2Iuc0tU4g6C+WxOcEvPv0 N78JMoyjMwDEnuhyNC8XkSAAIEjLqPMH566L88zi45HGxLPj1k/8ooVfvVKL7rR+7WE6 5bUA== 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=Pm2/wbYm/15QOw+WSiycgHfN7KMIGtff1jHn0IvoOd4=; b=DNjFMsm+D0FbtWa5C4zxl/gbKVXYM7sS4zdhyPrLFiyJ4ZpRgKft0DdQeq5Z/gB/NQ C9rTFOJu99JmumTFAc+GfQvQMxA00a5EwPgq3rNnNgaTSvlty7OchSqFdVQSycoD0jEw pgspmIQFYAbzcfRv3wykxHtilfaRM3VARlbyL2VVfUMu1U1J51pCxAqXz8br16SAqDe8 WJorWM7vaiGFxfvni4x5wTEyhCOt//U7YKYbITh0jP8T4jL2PuE8oI0YsLCxZHFI9pfv wLy2cI+KTXOV22zXfKo39CKneS7dK0qpbk3ITjMHw3glnmXBULsH3YbMGYql1DJbCOJE se4g== X-Gm-Message-State: AOAM532XQ5/LKk4rim3eF3jHUa0+V0f9cH8PSyR/hVNC6Gr9J0Q4oPbI WccGMUwmOrXSZZUhfMoewGUQD2KsuaM= X-Received: by 2002:ac8:5c03:: with SMTP id i3mr2057093qti.107.1642039120591; Wed, 12 Jan 2022 17:58:40 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id u19sm893081qke.1.2022.01.12.17.58.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:58:40 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:57:48 -0300 Message-Id: <20220113015806.519-13-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 131/281] rm: 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: KGXeyjfKvs/5 From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/rmdec.c | 6 +++--- libavformat/rmenc.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 3a3f6aaf09..49c2645ecf 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -152,8 +152,7 @@ static int rm_read_audio_stream_info(AVFormatContext *s, AVIOContext *pb, if (bytes_per_minute) st->codecpar->bit_rate = 8LL * bytes_per_minute / 60; st->codecpar->sample_rate = 8000; - st->codecpar->channels = 1; - st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO; st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_RA_144; ast->deint_id = DEINT_ID_INT0; @@ -189,7 +188,8 @@ static int rm_read_audio_stream_info(AVFormatContext *s, AVIOContext *pb, } st->codecpar->sample_rate = avio_rb16(pb); avio_rb32(pb); - st->codecpar->channels = avio_rb16(pb); + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = avio_rb16(pb); if (version == 5) { ast->deint_id = avio_rl32(pb); avio_read(pb, buf, 4); diff --git a/libavformat/rmenc.c b/libavformat/rmenc.c index 1b2b0ecf38..1fba092b88 100644 --- a/libavformat/rmenc.c +++ b/libavformat/rmenc.c @@ -228,7 +228,7 @@ static int rv10_write_header(AVFormatContext *ctx, avio_wb32(s, 0); /* unknown */ avio_wb16(s, stream->par->sample_rate); /* sample rate */ avio_wb32(s, 0x10); /* unknown */ - avio_wb16(s, stream->par->channels); + avio_wb16(s, stream->par->ch_layout.nb_channels); put_str8(s, "Int0"); /* codec name */ if (stream->par->codec_tag) { avio_w8(s, 4); /* tag length */