From patchwork Sun Nov 6 21:33:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39216 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1756833pzb; Sun, 6 Nov 2022 13:33:49 -0800 (PST) X-Google-Smtp-Source: AMsMyM5PQxQpv8ggjmkbFS8HL/onI+Df6ryOx9SI692GN5Iv5rD/JU80ePJNlW8n85hQmFxKlCBC X-Received: by 2002:a05:6402:294f:b0:461:f5ce:31e8 with SMTP id ed15-20020a056402294f00b00461f5ce31e8mr46340183edb.363.1667770429617; Sun, 06 Nov 2022 13:33:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667770429; cv=none; d=google.com; s=arc-20160816; b=GhMRSaVEv7raCSGPbSnpsyrb/N+WmAnm4Mj8bOgXAPuXyVSQQgPZKS3FydYaKSiqtn TkOpZVgg4RN0gILVXAs6m7DvQXZHFOsO/idcMVQd0r9FqVuIFH0MITE5W9OU0kJaqfyn AiJ1ySPdqAb0ZEFU63EzL4MPbyrHO4rhR4bDvvhD+Sz4Q3xubI8BTxQBToJKfD2fMq0M 5LN29Y/zoCSeyeT3vGXHtB5VOIiqvXaqg+icmUBi2BjoiRBOXObOYDIVqKxTs2mdvwlc WMMYQsrV8EJABcMKW8OOa2HEj4zx/0h2JQPjvDWjA0u+99qji1FwZMQ6BnqQ1cC2OwyP OUjA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=1bAO1TK99Ff1kLYA3Ru9UPtmaGVVUeQ7V57x41miBZU=; b=zhvCBB22KvAMioBq38m2ZeCLF+QfnAbFTebrql/BVrXawf3oDdEFuH2wRWTFhFrtz5 yUpqP/KqJgKpUuJ0yYom/oLJQeSidIvMFbjRFYvJfwoK8G0R+i1QdmypIzEsek1qeHBs NnHPF/nbRxnpGdF88UT7FsBjsfHGFW0ANJpUzV+eMzm28JN5zVMXPdvaBlQqFC7iM1JZ +huLVIvXQuQFMFD0A8L17apvhGUli24Zz7f6KbHlgWnfrjr1t/uWyMqn5gv+gi+3af7g 0m8I9tj2/F0gENPCIRoZl+79dTbRcapwgupzf33/bK3FBXcmjT+aGe1tl8AYfZKetSWY Ov2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="e3/C59mV"; 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 c96-20020a509fe9000000b00461a9775fa9si6896498edf.222.2022.11.06.13.33.48; Sun, 06 Nov 2022 13:33:49 -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="e3/C59mV"; 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 EA54F68B890; Sun, 6 Nov 2022 23:33:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com [209.85.167.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC10368B5B3 for ; Sun, 6 Nov 2022 23:33:38 +0200 (EET) Received: by mail-oi1-f172.google.com with SMTP id g10so10407004oif.10 for ; Sun, 06 Nov 2022 13:33:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=XRpssqtcd+2m77l9Ej5pIrUCFZNk9tHCsiRSDoXghAs=; b=e3/C59mVZFtLgfA+zVoOe2a2/bl+PAxgmSWu/puN0fbsvzkHF9BV0hpXBUsCqP8Hx3 lNvfU7xNKOqO6dXsOrza/6qKw9jxRKEHT/QT9ODfjIMU/TBBK2YHJ5YnPFyvZZNud+JO zuXNQB2S6/6WbrT/oR/jws6UNiQ7XMSPO4XBshFMUOdwpv/36VXIiFqy9keUAEGvfQy7 aq5cvwM59gYXoRr2wJiG3Ep14/ffZp2pMzMclGuQqTKcDrh2Nws/nXI09gUiBTEwUGdc U9IIUhScE+zszvm9HesAadx1R0dJvTNj3GHoyrPE1quzrtoOJ4CVNv01fr4SmFB4poEO XPMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=XRpssqtcd+2m77l9Ej5pIrUCFZNk9tHCsiRSDoXghAs=; b=ZKeMI8BpM8p9MgZU4wlawO9SJ8TcafZms/1XiHiALomT2OPjF3FUkao0fajVyBJf+y DdWXtmAmBtiADx5Afzw+bW9GKcWsHkI8eG57mXFr7xyhXknqUpccvwGIjpBmRKQ+jM5R 2r6YxRkF4sIkmdTAlaTiycwkuo3IfRxQEPsudCO9JoDvU0O4zHIwh78OwqMXqzegixTS v1cSba0vRPpH+XU7HAXVG++Z6CAzBGXpVRrSWAGdo9fCQnoqaOTBGJBi3gzB0cWcHLU0 UOHOthNfRGTbQuXJvCeepnGWeNKGEvgCpAOIoCIXCGrjF/nxo+ytyWDNgBfx6n4O/zN3 9lvg== X-Gm-Message-State: ACrzQf1+wxu0SvFEYGSWLhRUVtz5wp3VvyxyzppP8tbhBed0CcB7z5Q6 2UyRtZ1PqdfOOvCxeonvNFZCCh5LzeQ= X-Received: by 2002:a05:6808:308b:b0:35a:5288:65ad with SMTP id bl11-20020a056808308b00b0035a528865admr10143526oib.219.1667770416777; Sun, 06 Nov 2022 13:33:36 -0800 (PST) Received: from localhost.localdomain ([181.85.72.69]) by smtp.gmail.com with ESMTPSA id p20-20020a056870569400b0013bc95650c8sm2231087oao.54.2022.11.06.13.33.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Nov 2022 13:33:36 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 Nov 2022 18:33:25 -0300 Message-Id: <20221106213326.5808-1-jamrial@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avdevice/audiotoolbox: 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: W7JjKiXK5V6Y Signed-off-by: James Almer --- Untested. libavdevice/audiotoolbox.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavdevice/audiotoolbox.m b/libavdevice/audiotoolbox.m index 0cb97b5e46..27a1fd4a78 100644 --- a/libavdevice/audiotoolbox.m +++ b/libavdevice/audiotoolbox.m @@ -173,7 +173,7 @@ static av_cold int at_write_header(AVFormatContext *avctx) device_format.mFormatFlags |= (codecpar->codec_id == AV_CODEC_ID_PCM_S16BE) ? kAudioFormatFlagIsBigEndian : 0; device_format.mFormatFlags |= (codecpar->codec_id == AV_CODEC_ID_PCM_S24BE) ? kAudioFormatFlagIsBigEndian : 0; device_format.mFormatFlags |= (codecpar->codec_id == AV_CODEC_ID_PCM_S32BE) ? kAudioFormatFlagIsBigEndian : 0; - device_format.mChannelsPerFrame = codecpar->channels; + device_format.mChannelsPerFrame = codecpar->ch_layout.nb_channels; device_format.mBitsPerChannel = (codecpar->codec_id == AV_NE(AV_CODEC_ID_PCM_S24BE, AV_CODEC_ID_PCM_S24LE)) ? 24 : (av_get_bytes_per_sample(codecpar->format) << 3); device_format.mBytesPerFrame = (device_format.mBitsPerChannel >> 3) * device_format.mChannelsPerFrame; device_format.mFramesPerPacket = 1; @@ -193,9 +193,9 @@ static av_cold int at_write_header(AVFormatContext *avctx) av_log(ctx, AV_LOG_DEBUG, "device_format.mFormatFlags |= %s\n", (codecpar->codec_id == AV_CODEC_ID_PCM_S24BE) ? "kAudioFormatFlagIsBigEndian" : "0"); av_log(ctx, AV_LOG_DEBUG, "device_format.mFormatFlags |= %s\n", (codecpar->codec_id == AV_CODEC_ID_PCM_S32BE) ? "kAudioFormatFlagIsBigEndian" : "0"); av_log(ctx, AV_LOG_DEBUG, "device_format.mFormatFlags == %i\n", device_format.mFormatFlags); - av_log(ctx, AV_LOG_DEBUG, "device_format.mChannelsPerFrame = %i\n", codecpar->channels); + av_log(ctx, AV_LOG_DEBUG, "device_format.mChannelsPerFrame = %i\n", codecpar->ch_layout.nb_channels); av_log(ctx, AV_LOG_DEBUG, "device_format.mBitsPerChannel = %i\n", av_get_bytes_per_sample(codecpar->format) << 3); - av_log(ctx, AV_LOG_DEBUG, "device_format.mBytesPerFrame = %i\n", (device_format.mBitsPerChannel >> 3) * codecpar->channels); + av_log(ctx, AV_LOG_DEBUG, "device_format.mBytesPerFrame = %i\n", (device_format.mBitsPerChannel >> 3) * codecpar->ch_layout.nb_channels); av_log(ctx, AV_LOG_DEBUG, "device_format.mBytesPerPacket = %i\n", device_format.mBytesPerFrame); av_log(ctx, AV_LOG_DEBUG, "device_format.mFramesPerPacket = %i\n", 1); av_log(ctx, AV_LOG_DEBUG, "device_format.mReserved = %i\n", 0); From patchwork Sun Nov 6 21:33:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39217 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1756876pzb; Sun, 6 Nov 2022 13:33:57 -0800 (PST) X-Google-Smtp-Source: AMsMyM6eBvL3DcmU8IZ+ZfJgRLS2tiCJVaAuABswqrSj1320e1MX90DJ+hAG7XhD/ZxgyWqsYR6H X-Received: by 2002:a05:6402:22a5:b0:462:b393:f281 with SMTP id cx5-20020a05640222a500b00462b393f281mr47407371edb.379.1667770437369; Sun, 06 Nov 2022 13:33:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667770437; cv=none; d=google.com; s=arc-20160816; b=Dz1wU4XYIOTIbbV0LBkBzSEtVLrIjntEoya2ZeIOyf6/noutwUFL6lYSt/I+FAxdjL l0z4TRaawG7j7PRsZV1ULzZnjsHD3GKKVxgLUzyJakBZUYRIVmMbD2iB4zkxs/hyUYHT cK9RA9Q/f+Tnd1bvzQ2/cgXzpG358n5V30PCbPS+qejIoGVtf3D8T9orJf/g38O18qZu 8JMFZatRhkLFn4auXUvbSCqK8y+lWwqMcPIia+zQTZuF50BMw0J0ClGT/Y2EugpjnTaA zbuMgb29IDX7eOfd7ivTaSGTQnKc9D2cCbHfDEPm3b/9e6B7/1ZGHbVISGVgnP9MH1zs ic9g== 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=ZHGgaW7NIvqoaqYOqjKJpOdqFKGp1KkcZMiCWCItLiE=; b=fW6pncSDvJ0OrWz9kGuqraL8iuiQMSFQlJiacylwvM9JHoxYq1dXl3ierLQA89/cxb D6mIGLVrc/604jKZYbydEv/7WTOSlG3Gv0ePSZ0t1k3wqwUFeTIBQX40OreJw6M7e49M 2mgHXOfUQEdPyivLvag4J0dZ5DgUtN079M1OI5BSczT0NBodnWOGRicUg1hygoph0Oi1 ICtlDLSWN5gdWOSpgI0cx0Xmf/MyeQXVVWwvGdU6o7c45mydk4I0h5hDw0idV3+ALH+N hHO0ajSPabb7tMDP60UYL3lA+kxM/VaB31IxmpuRJ+tR54/Y7bapTla8q5UTOcHoObUz N27Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ENhLvx0e; 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 x19-20020a170906711300b007add1f44d35si5114333ejj.963.2022.11.06.13.33.56; Sun, 06 Nov 2022 13:33:57 -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=ENhLvx0e; 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 0742768BA06; Sun, 6 Nov 2022 23:33:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f46.google.com (mail-ot1-f46.google.com [209.85.210.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DAFF768B797 for ; Sun, 6 Nov 2022 23:33:39 +0200 (EET) Received: by mail-ot1-f46.google.com with SMTP id a13-20020a9d6e8d000000b00668d65fc44fso5565013otr.9 for ; Sun, 06 Nov 2022 13:33:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=gikhnfVWQnb4EOZ/8cB7M0cXtNinBhmuY/zGP7MotXk=; b=ENhLvx0eAgIqQKLjdkYtYLX/cOZO6TbYiEfyUnn3/voVivbamJeE6Njf4mXnhK8v0C coy50GiB6Mz82JVO6EydUO6W/8fKXLu4iGGNR4301obBN35pM90y2NI3QGaOjOPSFo09 7X2FvH1shvzLnDREtgmlka4SlWOp6bavsADzAG817fRKJ1XXsT+/LummB85NiGAOlUP/ kOJLB/jTSOmqqAVcrDgAR1WZGo/3RJD9NFBQp7shQzwj8nUKX9yZvyhBJMRwYBsmzp80 vjtsikXzB9JjxqPCT+o36t8hGsY0EnakjDDceEddHK6MwEy6GMTloWq9WVuYMM8KGvSv fsow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gikhnfVWQnb4EOZ/8cB7M0cXtNinBhmuY/zGP7MotXk=; b=13J2o6JlP8x1LDnY9psX9ao054dmPEcPUSgTL/16vHPpuCVilN9dvr4w6/8pykPlpS ZK5dRmHi8d5pwZfDEWrr6v2PDlIniCFJbvr24iXYsgQ79Mpn2xu+V6849SXpl1PfuMIJ RZREfDNKTGU7OTEMcywz3ljpG88AnaTEjtpNirtmerMs4BBD3C8o6xVEwwZt62od4ekY FtckbkBWmGoxQgLRZJ6sRL43OMG4YnGT4DIQzCqHftB3IXoZNf03SjRDlHo08lYR7Rir k2ejBTBg+s2m1xR++Gf/e7Jxk/gUIMiI8wd8qXaTP79Z1YSzPtaU7wOYlu6IvGWNo1wW WWoQ== X-Gm-Message-State: ACrzQf1mFScjBlYq3FBLM21FNPdOiDL+6tVZfvTjbqSAhZ54xf0AtJ0b xOFyTqQK2/HhGSr0CZElleHxFPTB/SQ= X-Received: by 2002:a05:6830:1012:b0:66c:6237:e6e4 with SMTP id a18-20020a056830101200b0066c6237e6e4mr16910484otp.72.1667770417998; Sun, 06 Nov 2022 13:33:37 -0800 (PST) Received: from localhost.localdomain ([181.85.72.69]) by smtp.gmail.com with ESMTPSA id p20-20020a056870569400b0013bc95650c8sm2231087oao.54.2022.11.06.13.33.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Nov 2022 13:33:37 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 Nov 2022 18:33:26 -0300 Message-Id: <20221106213326.5808-2-jamrial@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221106213326.5808-1-jamrial@gmail.com> References: <20221106213326.5808-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avdevice/avfoundation: 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: PU3ZcSQsJH3r Signed-off-by: James Almer --- Untested. libavdevice/avfoundation.m | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m index c9de93f774..36ad834753 100644 --- a/libavdevice/avfoundation.m +++ b/libavdevice/avfoundation.m @@ -706,8 +706,7 @@ static int get_audio_config(AVFormatContext *s) stream->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; stream->codecpar->sample_rate = basic_desc->mSampleRate; - stream->codecpar->channels = basic_desc->mChannelsPerFrame; - stream->codecpar->channel_layout = av_get_default_channel_layout(stream->codecpar->channels); + av_channel_layout_default(&stream->codecpar->ch_layout, basic_desc->mChannelsPerFrame); ctx->audio_channels = basic_desc->mChannelsPerFrame; ctx->audio_bits_per_sample = basic_desc->mBitsPerChannel;