From patchwork Thu Jan 13 01:56:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33397 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp28491iog; Wed, 12 Jan 2022 18:17:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJx0ixXha0Xynv1ViYp6Esg8XighEYPcwD2OvQFsVUTHulfFz0SFJY9uq9AUidxSvR7TKi5U X-Received: by 2002:a17:906:3617:: with SMTP id q23mr2005979ejb.300.1642040256999; Wed, 12 Jan 2022 18:17:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040256; cv=none; d=google.com; s=arc-20160816; b=lyuOQVzwLWRuTP1QGdfLPYE2t/621gDbAPCFEVrPyieD2zDxUEECGXkSA1ok4DMs02 CDrkqEs7KN86jtcuH8yn4y/9nTmCKmHt5xd1VTMoBer3hxXRFpSGVt5JxMSPFQ3S177E iX0xmwGMsFz3GV56WwYh4VvqwZxCrpfSWjDszb8cbECr9qkgUA8T+4cSyJb/caZprNfd 22qJ6jY/K6t5oaULL5gH1BHB6g8iicBeHQrLZgSXrmgV6LR/h1UROjwLyd1HDF+bOtCy 6bXpObnskFNM+DC0ti/beofNxZxahYZ4HvShfcjjmILmFO33Pz6StGIsyAw8xfh6iruF yDpA== 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=rW4eGKJbg73SVxRY+cZ2SFbrbhRNRxInOeoqoNhB2+4=; b=Uldag5m2EK5eGimpHIZSAZpTiBDBjfHSeX+r1uaYzTB7X9SP9g0cCjfz4PwisXeDyH CajekEc/lTPzG82+hYyV43MrYg5z7A/REbjtxLwRdb/HLPcYzOLK231XlcFo/eNtYBuv BhxBI8qn9DFgBqFJ8dvs23Ebc9faCGEGJmoZR+l6zYHC3WkdZOWvMqqqYiLztE91rmQm yksFBw4/OQqVh9dFSM415++bCIFBAUgUakg+4yGwYwTndJTi5c1+qtJcZ8YXW0TCNgEY n/zo7CXKsMDNIRh1twqNNRnAYSAFB+TZgEqt1cv6mRgvhuZoVzHeDrJIq9ZJZcLpCEiW 0dWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=cZq3s7cd; 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 kl17si836699ejc.30.2022.01.12.18.17.36; Wed, 12 Jan 2022 18:17:36 -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=cZq3s7cd; 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 E135668B318; Thu, 13 Jan 2022 03:57:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2F8968B2F2 for ; Thu, 13 Jan 2022 03:57:01 +0200 (EET) Received: by mail-qk1-f173.google.com with SMTP id 82so5545460qki.10 for ; Wed, 12 Jan 2022 17:57:01 -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=Q/zukf5WoA5EUCj1/r74PK+Ygy/wXjPnQPJX3GFyAU4=; b=cZq3s7cdrShBIdGIjwyqGFnXUwD+2sGX1UMH8F+HQeG9B1j/LuohketrtRTjichH/T 2ZetoCLwH/J+aOAt850MBbgYEElnCILCWRwTqXpeG1mSK7FGSV/a40k+8fNBvb/JwkSx vHdMUHOB95gpBA5BC/IsXHVr+Z3KHhH/RkiHd1C+7LWFlmBM/dhf2F8xMMGnjNMn/iX6 COIbKH1vyO6AIiD9TzgRRzqLjVxlom1GfNO8i8tRvcwCErvrsuJeTUBqQeegRDQxDIHG qV+j3yGrLyognLnydxC+M31+Kf2v4Lg97WQQ+eII5uR7XDYEeAhw+ZAVFHjTcz5XoAkf +4Ww== 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=Q/zukf5WoA5EUCj1/r74PK+Ygy/wXjPnQPJX3GFyAU4=; b=hyvdkAIwenK9IE7Ih1RNxjcXqU6cEkkmw16aiOhaipUYBthqQQZtwm+PO0IMR3qW5+ SXShby/RNdXcFcEwsHmWYLpjuSzvrTOZZmFJOHglVyQvPfhGA6Uf0AMKNhf68YkfZh83 z3yEQ1mo54+KcvVYR8e/MiW7fnEjAN4o19KNHDfjnzvk/+T5j/zqzrL1WwTWQkW4yuJH lWscKhv6Cg48n/ZWxtNnMZ0YFCoHhEfnV687V1doa8R84bHheiG0oH2J+us7wYm9ooEq 0po6uq4mrWF/wXWaxczdpm8Dif8140Di+gYqgHtIONTmFG0dPYJBTRXJt4ayzHdZ4j4z FVUw== X-Gm-Message-State: AOAM531X3SUfqtqhJQKRc3QUkk1IBpUpfuIkwLqyLD6ePyXGd3r78W0Q MSnQMZGYCoHkWWMy4uYdD0TDXGZd4F0= X-Received: by 2002:a05:620a:2585:: with SMTP id x5mr1831914qko.263.1642039020336; Wed, 12 Jan 2022 17:57:00 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id t11sm906506qkm.77.2022.01.12.17.56.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:57:00 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:56:11 -0300 Message-Id: <20220113015612.448-30-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 118/281] oss: port 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: DvzJCLyIm14P From: Anton Khirnov Signed-off-by: James Almer --- libavdevice/oss_dec.c | 3 ++- libavdevice/oss_enc.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libavdevice/oss_dec.c b/libavdevice/oss_dec.c index 4f3772c1f5..d3fc59d0ea 100644 --- a/libavdevice/oss_dec.c +++ b/libavdevice/oss_dec.c @@ -59,7 +59,8 @@ static int audio_read_header(AVFormatContext *s1) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = s->codec_id; st->codecpar->sample_rate = s->sample_rate; - st->codecpar->channels = s->channels; + st->codecpar->ch_layout.nb_channels = s->channels; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; avpriv_set_pts_info(st, 64, 1, 1000000); /* 64 bits pts in us */ return 0; diff --git a/libavdevice/oss_enc.c b/libavdevice/oss_enc.c index 3103d2de9a..d6a512a264 100644 --- a/libavdevice/oss_enc.c +++ b/libavdevice/oss_enc.c @@ -43,7 +43,7 @@ static int audio_write_header(AVFormatContext *s1) st = s1->streams[0]; s->sample_rate = st->codecpar->sample_rate; - s->channels = st->codecpar->channels; + s->channels = st->codecpar->ch_layout.nb_channels; ret = ff_oss_audio_open(s1, 1, s1->url); if (ret < 0) { return AVERROR(EIO);