From patchwork Thu Jan 13 02:00:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33432 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp33547iog; Wed, 12 Jan 2022 18:26:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJyt4/EBCzPl7+R0tfDsSUaDaPmlgUEwp1Pgs8O5qaZ4jPSMjnJLTsr/TUMM3XbQFkmJxTxt X-Received: by 2002:a17:906:5042:: with SMTP id e2mr1999990ejk.647.1642040784875; Wed, 12 Jan 2022 18:26:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040784; cv=none; d=google.com; s=arc-20160816; b=cWmwTmowxEGZj5lqRvMi8BonO8h4sk825JeS80sd1f7sAm2VtrlRIBSR5VTiNppaQZ tYa4sNuGItjau/kLkuYQzlIqLj49Q77iaGf8u5qfeXmWeU/6lIADfLuG3H94trDvwuHz YImm250G34CMZOl/Mn8uVeoJhfnFirxz3NEVvHg0FZGtLyqgui5pdwJgID16YVzi1jTl nQ9TdYtVUj2Ars8wr3UpFPxSNyFvs0wS33M2+XADHW8RFmM3fufPFsAic9gRA5/ozomp bgyooFlIM591xtNXjHKCe7+dXY4tBTAVwhGhGy9bdYhpVDiy78hxam3rMgOY6LwLkeyY pZmA== 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=mj02Q0dROYcDBfRVA/nuVVJkY26j22yt91J7Uvp7woI=; b=ALvVjLOqMSkrYvMO00MlEpHwRhYBTTyJAqW5l4apYJ1+DLW5adY3LObCphI/2kTquR I/qHTpGMZHZwMw96ZkfsnOregx0OTokKbzZFnppWRmEa517KXboItBFTclPtsAN+kiwY SqUqtAkPnih5PnqGOpufTfwlJKlbdfB4lGGDUvRpui1ZkvPNlLgkhf22M2Ai4psNwutH MRF4nLcZeAIp9gZoBO4mi3Kt2wAeJ6rkWgBgycAqp4r667FDXbfOSWLN9ihh4eC+Reu1 DONjFymkoYrQ8HkioaYcJ3+AcPXabNOOGXumiU84+W7v8JJnq/l87Ixxl2O8gMg6OUP3 i3hA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=O7o3aQCV; 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 d24si880196edx.418.2022.01.12.18.26.24; Wed, 12 Jan 2022 18:26:24 -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=O7o3aQCV; 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 0297168B480; Thu, 13 Jan 2022 04:01:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com [209.85.219.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5A44968B45C for ; Thu, 13 Jan 2022 04:01:11 +0200 (EET) Received: by mail-qv1-f51.google.com with SMTP id hu2so5095085qvb.8 for ; Wed, 12 Jan 2022 18:01:11 -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=OxBB94zUrGR4KD3J06IO29Vjh8SkXb6HRPdmx2SFVtY=; b=O7o3aQCV108nD9N2WEt510hJsQlnNWshXXztO7XKlxdzLvAcWn5HLYt/Urgp+ovW2O 3MBRa4bvf7jw3QjF0M8pKRH4545BVxYrPXOoEq0QD6YrN3oBRC3XNkPtWw1Y3cUxEH9r zWm1eoXtd+FC2X0umdF62tww7gR71SwvGd/u4M6OJP4EX6I3TcloRRT+t3QY71fIlAYM hTx5piLkIMDYsQBDGryE+hHwQIjGytxrCNTooHs5hL7gem0JcqmVc9mktB5V6zxJMid0 x+3IEVSX5nINhf8vby7gdGHancvczKHdKvA4yUSwsU9UPprOrzFB7+/FUFdlkI6f+vHJ ZOhw== 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=OxBB94zUrGR4KD3J06IO29Vjh8SkXb6HRPdmx2SFVtY=; b=1TRB6Cs7BPVDIktdCxvijg0Y6rKcftDdjQlLAB9reJ8d8XMBlKRr9GUTAhatRx4zj6 d8iG3iw+OfkCMc/RByCAQv5Qx2n+4hfEsDiZzTz3AtfOy/CjQxBm+MzJYb0Tdz3hFixm PeKHcuv16yaPKGleTG/O88qj3Mc9n38c+jlKGFvycyrH/PCot/GTEXRPrGuyoye3l3Vb 25sJdZfcX2fIm4F8RNLgHkyS3TyJTqnbySdF+W5f4KM3yqdrv9RjVK3EVBncFvNhGjdU wrAJLk7T+Phr1Gu683RHpi0c6TMUelwg75oB7SdspqHwf+iPPNhUNi4gzYvvFnDfvqiJ tNKA== X-Gm-Message-State: AOAM532zqElAgUAEeq4hosy4bN1JBzHUHfHeA06fLYTaO/G8hazYQUNC SsmRnmsV9tiUx+tp47kGZdbzIa2aHSs= X-Received: by 2002:a05:6214:238e:: with SMTP id fw14mr2291271qvb.86.1642039269977; Wed, 12 Jan 2022 18:01:09 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y17sm1182232qtj.75.2022.01.12.18.01.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:01:09 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:00:01 -0300 Message-Id: <20220113020026.590-6-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 154/281] swf: 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: zBKNHaSoGVm4 From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/swfdec.c | 8 +------- libavformat/swfenc.c | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c index e549e4f50b..52c5e5c480 100644 --- a/libavformat/swfdec.c +++ b/libavformat/swfdec.c @@ -195,13 +195,7 @@ static AVStream *create_new_audio_stream(AVFormatContext *s, int id, int info) if (!ast) return NULL; ast->id = id; - if (info & 1) { - ast->codecpar->channels = 2; - ast->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; - } else { - ast->codecpar->channels = 1; - ast->codecpar->channel_layout = AV_CH_LAYOUT_MONO; - } + av_channel_layout_default(&ast->codecpar->ch_layout, 1 + (info & 1)); ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; ast->codecpar->codec_id = ff_codec_get_id(swf_audio_codec_tags, info>>4 & 15); ffstream(ast)->need_parsing = AVSTREAM_PARSE_FULL; diff --git a/libavformat/swfenc.c b/libavformat/swfenc.c index 1fd2ad81a3..d12fb59348 100644 --- a/libavformat/swfenc.c +++ b/libavformat/swfenc.c @@ -348,7 +348,7 @@ static int swf_write_header(AVFormatContext *s) return -1; } v |= 0x02; /* 16 bit playback */ - if (swf->audio_par->channels == 2) + if (swf->audio_par->ch_layout.nb_channels == 2) v |= 0x01; /* stereo playback */ avio_w8(s->pb, v); v |= 0x20; /* mp3 compressed */