From patchwork Thu Apr 4 16:29:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 47800 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp436893pzd; Thu, 4 Apr 2024 09:29:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUEBQ9i9rt37LW4gsRXv/QgovGH0r4mb2S5APwuxchSyiTU7TFVaRYzI4ri/yRDmGDVe4bLriF8A5zzzFW1QV13hrXt5lwLbVtRTQ== X-Google-Smtp-Source: AGHT+IFF9n5VE26QpfRd3hyDhgwL4iIxxdgWlXPwIe8ScaRmuD1Tf+NxU2O26m+PCvWZ1nk1TzsJ X-Received: by 2002:a17:906:e214:b0:a46:9e84:37d7 with SMTP id gf20-20020a170906e21400b00a469e8437d7mr2062801ejb.74.1712248196123; Thu, 04 Apr 2024 09:29:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712248196; cv=none; d=google.com; s=arc-20160816; b=YuYnba4WaTOz+20bcxIQkpJE0i+vRydmsx6RmypAzhJV28DPREBRik0LVEjsogRzCO 3nei25fyANdou3LjbUTyo0fmp3t0i2VwuD5yosvDGYLzLDHJvDMsEe0HKzImd8Xfn8/n TXgEzrruaImpjmAHjujNyKaPOSJwvzyie0HkLvvadlGbnOzdtzle1cNI2C4dkNTBC7QK BLq5AnZ+gDyrG7+2v064p8u7nhgQ9OT0C/VLNxCaspx6e6irtEDla5JTy3hqJROk8jdV 5BECppulGayimWHafS3SwKVG5fgdWtXjmE+SkpgfT8HI10vhursSSEGs5ZxbG6t+oaIt VYxA== 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=JRiiQDhYxrDb9bpdg68lhfAdRE1PS0u4llZNFZiGwjc=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=orkG7zm462XlSyr65UfFwMEBiJMiSPrOUDNN7xiLfjbLVX7lSn60dFML538YoEz5Vn q66JVMrDOmh/YpWgb6sR94PbxoPfnxQqEblN/7OijIN7BRRTzjIY6YgRv7jW7s3287nf bwwc5iQW3vV2KPTKD6zA7WBsBmMGy9nFAovTSeubVR7FhWrlpqfMmFLg/SrwgoLMb48r ui3Fn2jV0OVEuPGm5wsi75BNqLg2lxite1zVQs5LFm7BK07KaRS0lI2fLfOCxCq/D3CL utBvi8Y/kGtM5YYQT4n/CS9fAYXm+AHLn3kCLIzD5iF6QXTDa+BxNHKPJ8mq/3UJRcOr jZ7Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=UaxSxCEh; 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 p4-20020a17090653c400b00a43e01d239esi7945181ejo.687.2024.04.04.09.29.55; Thu, 04 Apr 2024 09:29:56 -0700 (PDT) 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=20230601 header.b=UaxSxCEh; 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 C4F1968D128; Thu, 4 Apr 2024 19:29:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A239568D0DD for ; Thu, 4 Apr 2024 19:29:39 +0300 (EEST) Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-29f69710cbbso867353a91.1 for ; Thu, 04 Apr 2024 09:29:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712248177; x=1712852977; darn=ffmpeg.org; 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=BdzoUz4hLSTc2iQUsmciDfT9bKT1LZmp5gXOScijA74=; b=UaxSxCEhMFWGRzQquRteIpH5fRtE2xvG0/lUitYdPsCyv4qMXhcZh8DYEbSrtff7UY WG56wvpaZe8vXfgD9BrQCG+YpGQADUnX9GtzUC/BYs7Z/AXz6nDvJ3M/XawWJeN8gfEw RcI4Vv9b0VOLujZThwOVC153Cbay+S0oy0dXnwP5Fx5uAbQ30RqrwYgezOH3ADIRG6BK pc9erUZIxcJwLXNPQg/O0KeFXwEAZmQsxusAfngIPcgDqDF07bjzwHr52L/wBpqwi3PR sGvJXICEVdymq/SDWGqKAaM4tKXF83eaet/Su1WMJXfEiDn0PdYtcgS8pWZ2KYujWoG6 2j9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712248177; x=1712852977; 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=BdzoUz4hLSTc2iQUsmciDfT9bKT1LZmp5gXOScijA74=; b=e5EByAnNlnM5KDFDzKfnqRykfbcSiv/+eh6z1s+CcrBSIdqy3RWgGSBSC43gtVxjTd CmAUhKjy0wL+xLCdK0IT7KDowTfZB/zewra+DAhMY4JujJ55yK7xfINPIId6ElMyty+4 kcNHz2UH7Rtxs9gFqA5TWUmYM7H9Qna0hCU7+UZynGGZuNV5eq9Clq0SbV9lsxkfpALD r5hBobUqpxVLrKf+/aFLeuSLoLdrguaove4O55jgIPC6N9OBLGCO4O6DRem2limnrSPx NPrQdBrDhRSmCpQQhOKG2gIbfxKRl53GkB1JnzM4nKt6jYj1e46MqqLmKvSPpWvBrjYQ +1kQ== X-Gm-Message-State: AOJu0YzXQYfsU3+aZo9FFskUIHHgQeA6pjemwQHaOxu6GFsR/QsXQgZ3 HfCocS+kmt1Aq2oyh0jiH51ap31o6dmH8ZztImUThAtb0zbwKNfPoLZk6LAp X-Received: by 2002:a17:90b:3113:b0:2a2:1ec6:924 with SMTP id gc19-20020a17090b311300b002a21ec60924mr41096pjb.3.1712248176517; Thu, 04 Apr 2024 09:29:36 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id jx15-20020a17090b46cf00b002a2546fd6eesm1741104pjb.6.2024.04.04.09.29.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Apr 2024 09:29:36 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Apr 2024 13:29:36 -0300 Message-ID: <20240404162936.4581-2-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240404162936.4581-1-jamrial@gmail.com> References: <20240404162936.4581-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/liblc3enc: don't force unspec channel layouts 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: X1uCLk0S5BgE We only care about channel count. Layout details will be ignored either way. Signed-off-by: James Almer --- libavcodec/liblc3enc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/liblc3enc.c b/libavcodec/liblc3enc.c index 63d1645b10..5f8169a0cf 100644 --- a/libavcodec/liblc3enc.c +++ b/libavcodec/liblc3enc.c @@ -61,6 +61,11 @@ static av_cold int liblc3_encode_init(AVCodecContext *avctx) "Unsupported frame duration %.1f ms.\n", frame_us / 1000.f); return AVERROR(EINVAL); } + if (channels < 0 || channels > ENCODER_MAX_CHANNELS) { + av_log(avctx, AV_LOG_ERROR, + "Unsupported channel count %d. Should be 1 or 2\n", channels); + return AVERROR(EINVAL); + } hr_mode |= srate_hz > 48000; hr_mode &= srate_hz >= 48000; @@ -195,9 +200,6 @@ const FFCodec ff_liblc3_encoder = { .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_LC3, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, - .p.ch_layouts = (const AVChannelLayout[]) - { { AV_CHANNEL_ORDER_UNSPEC, 1 }, - { AV_CHANNEL_ORDER_UNSPEC, 2 }, { 0 } }, .p.supported_samplerates = (const int []) { 96000, 48000, 32000, 24000, 16000, 8000, 0 }, .p.sample_fmts = (const enum AVSampleFormat[])