From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 2F69646CED for ; Mon, 6 May 2024 12:15:23 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ABC8A68D61E; Mon, 6 May 2024 15:15:19 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2059.outbound.protection.outlook.com [40.92.89.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A62B068D57F for ; Mon, 6 May 2024 15:15:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nhqOwGxaF92E2w30b42275R0mITMvcRo0Zjqm3FfYdZZT9LIYZZx2kG/2aBwgN2iLb5D/pLQKgLXleF97+6FMpz5mb9/HMi94Ah/BAQ5QwAttf9Dm/MSUjgwjOf2EVWTp3u4JVOC4k/pNB5ep7KCqrfAeYxByPNryJascL16IdjXD0apZER8V9sYA7k77WrAacxrV94GTNatnM2Jm6aeC5KYitPnn8eAlETYgkO2MJKtNmmjX8UjHR/9AU/CqqQVytZgF2VfDAF/9H78KQvb9GpW77nB2WCY4n/GJzvO5HQkZe5XfyU3lza2HFOluIuU/61fcrUY/voGK2WryWRukA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=H5xq2zhplpyo/cHJyDFWEhZBhe9GijIMjmTznFKK2nk=; b=e+zIrtMyshYX91GJrclt+jljGzyhbe1Cc3lWIC6UmH9tY2zSszVgsdem4Ea2OtvdXVOpXri/tWPc8qf0FLNT1+9wLYm2uZWaqUl5vA2QvzNQ19tnOIyWJs3iEAmV1nXSV9eyx7SNRyYWA2l+IXNtD97jwhpfeCEwfcOLBEaS//+FACNpbxJwKH4AJvIR+OrXBI6aQyFnZ9nq6oIj/LiE8IwK1SCwNl6w9vLkQ5QpqOaPh6/o3TYY/oWlFT4ZQ5FxiEIeU+ontLpphDOVSCuaX2sgYJDanAeO8RygqAAGbb+1gjUdIVYZcKM2Uw8ML3DnBfhRgET0U3uw/tPoYgDJCg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=H5xq2zhplpyo/cHJyDFWEhZBhe9GijIMjmTznFKK2nk=; b=VOhppNtc+qW6B4oleUAiVaH1f6PKLP3uRf8xSPU94a2JQyQ434Hbt3pLOXtVPYxN6AanslbBkNL8dYe1VxA1i8XmQsRn8dnQ1KFRs7RpL8jNq1pl+WbXLih7u+hetidI5FxYatoIzT+zjB4GF+hE/ZF3i2htgNNN+YeYhfQEh04bhYf50OMzoa4qJbvo4R9CqN/y2TjrTb/Om0cdsCbzVvAKUeNt5U7G04LoSiD/1louw7tuI1wyKGHFq9ID/qkr3yZmBywmyzmVVI+ir1KSfR+71N0LiPW3HYZ1u4947ytluMeV04plf3C9EQXoaYFBLa1xEIE7KPZxju9PD/dbng== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DB9P250MB0497.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:33d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.39; Mon, 6 May 2024 12:15:10 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.029; Mon, 6 May 2024 12:15:10 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 May 2024 14:14:28 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [E9SsIUkSffaijOYTt01l/HN0ui4DyKcFAVCOQUjpoIU=] X-ClientProxiedBy: ZR2P278CA0069.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::15) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240506121434.225228-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DB9P250MB0497:EE_ X-MS-Office365-Filtering-Correlation-Id: 74ce3c93-339b-4a4e-6ce6-08dc6dc62ce4 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: DyWkTgQCgV3G5af3+KW5FBQ8SeCB5VSrHYoP1j7cDeb8+A+UHwKEtF7GxK2cPt0s9PTfYiN0TfATnX67Q9PWMHAiViKi9Su5JR+kPljLWafevlGmoEGu67NeoL8vfZJgnqnjepg0vpKHrMH9+r6D3ubR86SKTdcex3HXSWIwXd6/U+GI1+xyMXSBj6c/qFvkVUOvegmjkkzteekMpjDikp4Ha+28YVrPfiQmuEzhM2fwSX/iJzlvwF5e74TQNOiKaP5VCy8L9+qlnss4Elvqh04JAR52rXbKEVXfFrA5JkdYn4gLS5X3QQVEaZUGqdTlZSL2jFp6Yg/BqcpLye5X4SS2prm6qFX0AxEQ4AUIM85uXsaLK2HNZhXRGGUmK7gSxKXtzXgT2igIPn3KCUfe2R8zwQRo3a3dS/sGY2F9WKp5rXhYSZYTUed+1IGThwJNf9Ts6D57RcbB2INrZu+k/DMOd8/D07Usvd9gJQDi9guGrtTmylBNB6H/fX5lbD+zhhCl1nuRL3WWrJsOeSD8LWWVV8iMA7gIuG69TLBpuvEqzNLAzXbp0ZyhA9SpXnMsfADJrsxooHWMvVv6AlTpQIXdi/qBAPmbk4FFrqmwtSQ= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bKo+exjcrMUn2gAFuln5Dae035RR7G4YWlMJ4B+oBrNYj8gaHE8bo5jAq0Jg?= =?us-ascii?Q?6p/vt6n5OBDUyGw+Ftxw6uv3FJgctsDJevCxjI482c/KuQQFi7eD7gHo1z2q?= =?us-ascii?Q?Cu+G3R4pSnXORcSUKtzEz6ixK0+uauWpOd2bEf2CZK3n7chzAZw3p/48VZgI?= =?us-ascii?Q?3pGGdPwlWGVTq2PSPax4DJChQmCIaJM6CB9fr/Lt5reKRMBOhHa0NXTrjNGJ?= =?us-ascii?Q?VBbbZ/tq7DBLvZMZWYNyTTuSyKqmm3HLyIz66AgRc4bRveq3vRiuDQ+hPJrx?= =?us-ascii?Q?Xj1DhrGQ6w1z4keXDbdXlpBsxq4xgfspnlGGmLtnhZQeZHNNQBawa7Rf+AiH?= =?us-ascii?Q?jWGdb13/GrsTj2epYrLDzyO9d/2Mn84KYOXUaWeBYo6yPoU5GcV8TztrQO77?= =?us-ascii?Q?k3svrBx6lLp6azxzLcv/Wa7KM/OsAOrXeVCzzFxq9wT5BnECEeGb7/Of+wjy?= =?us-ascii?Q?l2/p0493LGYEUSEZArmkBlzWNZGlkMilclGuKuZ2Wh1YEIen03s6btq0gxOO?= =?us-ascii?Q?d1JB+l7D3YuTBtZSo7OCXCpVbpBVNv3uCZlHTnHuFXXlmUyKQ+sxDGfqjHO5?= =?us-ascii?Q?+MOE+tXDjPfqtWsXyW+uuo4Bn7rS7acU9aF2ssjiQoRlc+wnbHbCldZIIg1B?= =?us-ascii?Q?gDEivWOPsxcN49zlA+es4NGEExorsR1PjHAepAtvmXjMogtc+U47xEyr7THN?= =?us-ascii?Q?pbnqSbAZykSjEowbhrWs1ilaXcDgXNDMxSIgFdQDUau75BX7fH79pVktLWUB?= =?us-ascii?Q?ytasqvxbWsDBoqTKpkSW80B6Q1tUpHo6Po8PvypKPqcgFCKS3rNwFzoXQitV?= =?us-ascii?Q?Vy/t5iXnLWtg/AC3R9Mjg4jKpN/yFKhKdPNPKw55ai8yXGgWY5e9Y0wWYRLn?= =?us-ascii?Q?gCfZcoQ4aGshPe/KKBse1vZNW/g2zyg0oXyqBcVkTCR7yhS6kEDlfJ3bLCVO?= =?us-ascii?Q?Bbnz57oBFMUF/wUqQTfjfH4H3mjFwUYyMKZS1lAJ+MZYKTN/XsVNOURDc09W?= =?us-ascii?Q?CoE2puODJsbd+ceyrlp7vLgKd/y0ImFeTVohl0JIB/zzS7rWS8k0xYNldMfL?= =?us-ascii?Q?fzDEId4AgsOFavTxjw7XhOgpd9WHFmGUgtaVqTAAlhNGLxLKEjcG4Eh3Gt0Z?= =?us-ascii?Q?5DLYF0/hAPkZUTVTSInps7Dznjl6kgZIMeFVF7O4AOrCQYaV4JOhnH2Ox+zl?= =?us-ascii?Q?gOhVvfjizYsp9ppRKXlFqLQNWmb4MVolfZCHM+bUJpmhYqi68RzWKkYV06Rs?= =?us-ascii?Q?w7BTLUd/F7C49og166AERXcxmvMTutNwUbWgC7RTfw=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 74ce3c93-339b-4a4e-6ce6-08dc6dc62ce4 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2024 12:15:10.7151 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9P250MB0497 Subject: [FFmpeg-devel] [PATCH 06/12] avcodec/aac/aacdec: Avoid branch to set sample_fmt 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: Andreas Rheinhardt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Andreas Rheinhardt --- libavcodec/aac/aacdec.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavcodec/aac/aacdec.c b/libavcodec/aac/aacdec.c index a78a669602..1dc4af8a0d 100644 --- a/libavcodec/aac/aacdec.c +++ b/libavcodec/aac/aacdec.c @@ -1200,11 +1200,6 @@ static av_cold int aac_decode_init_internal(AVCodecContext *avctx) ac->avctx = avctx; ac->oc[1].m4ac.sample_rate = avctx->sample_rate; - if (ac->is_fixed) - avctx->sample_fmt = AV_SAMPLE_FMT_S32P; - else - avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; - if (avctx->extradata_size > 0) { if ((ret = decode_audio_specific_config(ac, ac->avctx, &ac->oc[1].m4ac, avctx->extradata, @@ -1254,14 +1249,20 @@ static av_cold int aac_decode_init_internal(AVCodecContext *avctx) static av_cold int aac_decode_init(AVCodecContext *avctx) { AACDecContext *ac = avctx->priv_data; + ac->is_fixed = 0; + avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; + return aac_decode_init_internal(avctx); } static av_cold int aac_decode_init_fixed(AVCodecContext *avctx) { AACDecContext *ac = avctx->priv_data; + ac->is_fixed = 1; + avctx->sample_fmt = AV_SAMPLE_FMT_S32P; + return aac_decode_init_internal(avctx); } -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".