From patchwork Thu Feb 22 09:37:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 46442 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:26a3:b0:19e:cdac:8cce with SMTP id h35csp226718pze; Thu, 22 Feb 2024 01:37:32 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXz8It697P0I4pXJHPoEFN729BdWVV2PeYn4XeXc7/xsM0jV4sxYZNyBsGCWVOQbjvjS4aDFpQZu3re9gBvNyR3M6rFh8d/yr9RbQ== X-Google-Smtp-Source: AGHT+IFZ3eqqPaMgv8b7+IGWjsbppKslnNYeGE+EpfOPv9EAikb0W1pUkBf97JSVC5RX4Zg9zEXj X-Received: by 2002:a17:906:b796:b0:a3f:33c5:ffb5 with SMTP id dt22-20020a170906b79600b00a3f33c5ffb5mr2909085ejb.76.1708594651930; Thu, 22 Feb 2024 01:37:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708594651; cv=none; d=google.com; s=arc-20160816; b=oCM/IxQKkiHE+SaOjpQe4YcutquJiZR8/C1SbHzLTE9tCTA3wVrMm/aVPzBifwnWK8 bNiKFcuS5wuIHlwm070cS0J0g/M4cjr4qpOyKmYSRmQpgqb6Up1DpFMdmT1/xI07H98L TJ0WIuu8tX5NpT3x/dN4+CAOd4ZPrCRTQHjjXVXGSkCOgXQiZgPQe9bsyV9eVKwNninB a6l3V6flDvBEmCvmSf3kbtZEZ0iV6JbFN/qH4WTxJnUHPPPLcGvGyhKuTq+NWPDq0zOP uzkYp4TneG/K7FMNYWd63LNvsZDKD0yRvUJqhzpUQS7HthJoawBXqH46mN+eA9iGOWgC jUOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=WnXxUlDj1jH5irBBiV3C/6G9tbVgyxUP5TNNb0r04no=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=zPFLPsv6eyrLEVJXf/dUmmm76/8JVrHjCf3I/4zCsXzfCOiKtwIFFCReNg9pQDcaXc gqXIGa6It3PpERkJAKE7rwjw7CNorF+eIHj1Om/0J7JpZq3OhHCJ5oRaqa8HZThSdEvN LKkTJyBtCYJXBlMBF2CaAAFPkXfHo+qPrDe6UU9Wb+a9UIBF1Z4hq5byOCyc90K8e1Hp HKjDnnYV7lleGnpwAmU//rKS8lYuZf4VRU3vqxOEQCAizcwgKr2c82DmpBrZpc0M2mJR KeAe87QVrdKkZ1hxdQO0pyf4bbPz9yQDtzfv6UF6/S612xaReOsjddE/BFzKREIvI9xO a2MQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=SOgk7oo+; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gs18-20020a1709072d1200b00a3e819b857csi4170245ejc.82.2024.02.22.01.37.31; Thu, 22 Feb 2024 01:37:31 -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=@foxmail.com header.s=s201512 header.b=SOgk7oo+; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2F0B668D222; Thu, 22 Feb 2024 11:37:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-190.mail.qq.com (out203-205-221-190.mail.qq.com [203.205.221.190]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5B8A68D048 for ; Thu, 22 Feb 2024 11:37:10 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1708594622; bh=v/ZJ/uTDGmOvzDJDKiU01liZ5JZTXjYvbEj9JWZPqrc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=SOgk7oo+HULLWPzONpMch8IKKsnjgZaJYKFVNONg91mbbkhDU0q16cz0igopvoF/7 SSHqDJW0Mw7kIxrISetht75TkMffFVkEKsuiRXbe9biLglduva/mibmQmKwbDZAJT1 34XEWrUMFkZ55Q7aVHi6dDVFQJoXym9CYtVbS7Is= Received: from localhost.localdomain ([119.147.10.191]) by newxmesmtplogicsvrszb6-0.qq.com (NewEsmtp) with SMTP id 940B1E01; Thu, 22 Feb 2024 17:37:00 +0800 X-QQ-mid: xmsmtpt1708594621t62qfwuqj Message-ID: X-QQ-XMAILINFO: NNoVXaH09J170bmX6EdjZMJT+3NbZYCoZ93XABSWRx4MLiXIaPOrAhD/u2EAyP z9DJr4YDTXhgQ1qKpuVxRfg8JS3uxbk69/sml+hJCGnk0gFVLRWy0/2Kyfk0JU+0mC71v7WAQN4J JwlMCQEPVPxEr2mepetVoHL+6Z+cxFuXUz9CXGLPPIMCEp1matitllGZoxM7VFN722r6q5vBZT0q eX3I0ev6q/fGXimtD7K0HbA6KGuII2I4KfwlmDW6k6hrx7kgO72aZLkoejqTCTFQhI15OYL+l0yy e3O4Boti2GnpA5s0pCbz6bVtQxLLC8piYZ57xlUT56m9U3APkZj4Qa+gKQAWg/YdgkPMZ85rx1A+ 909jHB3BUg1u8wnWIVzKyiwL2qVOBCEjlzdqIVPkyPS039R9q1Ar44A/zn6o72A+LE3PftvsMzmc fUp4H/ffsG3WnnfWR7APjsxt0ciIt0OUmsE8TgXJ1+bKOER85cmJKUGirt4CxlNVD7GxpWhiIJ08 0idINzNt1VOq2HwEA5YizEDFgcQRkq9UXxbc6qrjxP82wgm23K2GihAQOeeDgJRhpFK7kekXqQmK 6TSD0Q+Se4dR/miet/MWmraJHztmeUv0UrQta6PuBGGVZ4J3VYrcx4VjIVYs7wj2TKib1NRb507l mYZL44OlsuD97Grl5YY7mi9mIUUpXlz8lnE1cF5xPc1RuYpI7esvcH6iaviOLqVWvUuGo42GMk0J 9z5P7TEVQU8g95mr6504vALBOWB0hBV0VOIr1leAbhqG9MoAneO6hvYRtfp5ckAEPT3w6fOFwHBj TOEDgHuDb7zzCHFPuz5P8TnSJDpU5qKoSGUfQmIwzHOszy67N6t5cW9a9G/ienwktyDfFUI2d3gt 6WfVdxvSSeinqgN+w1WHmTdonfAPTWkw84RO62eVtZntAuInyffQc1LntTxU0nGanqJ7yerT1qxl DRFcsk3AyqFlV7ISUO7M9aiqGFvItLjGh7iAMgdfUdp7/sv5qBHLjtB5UcN8Tn X-QQ-XMRINFO: MSVp+SPm3vtS1Vd6Y4Mggwc= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Feb 2024 17:37:01 +0800 X-OQ-MSGID: <20240222093701.70585-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240222093701.70585-1-quinkblack@foxmail.com> References: <20240222093701.70585-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/encode: Fix default setting of bits_per_raw_sample 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: TRnEiA+EAXWC From: Zhao Zhili bits_per_raw_sample doesn't always match size of AV_SAMPLE_FMT_, e.g., S24. --- libavcodec/encode.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/encode.c b/libavcodec/encode.c index a436be2657..8ca07814ee 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -736,6 +736,8 @@ static int encode_preinit_audio(AVCodecContext *avctx) } } + if (!avctx->bits_per_raw_sample) + avctx->bits_per_raw_sample = av_get_exact_bits_per_sample(avctx->codec_id); if (!avctx->bits_per_raw_sample) avctx->bits_per_raw_sample = 8 * av_get_bytes_per_sample(avctx->sample_fmt);