From patchwork Wed Jan 5 21:37:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33096 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1100666iog; Wed, 5 Jan 2022 13:37:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJxRrAmzqvEfpcT1eTSt+beRlFJ7ToRl/Jjpc2ifKG0hCpLbJFYSzBrmCi0Jov1hWBP1quC+ X-Received: by 2002:a17:907:6d1d:: with SMTP id sa29mr45020501ejc.413.1641418674596; Wed, 05 Jan 2022 13:37:54 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jl22si24882ejc.226.2022.01.05.13.37.53; Wed, 05 Jan 2022 13:37:54 -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=@outlook.com header.s=selector1 header.b=JRaidnKA; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AA5FD6899A7; Wed, 5 Jan 2022 23:37:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2077.outbound.protection.outlook.com [40.92.91.77]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C296E6899A7 for ; Wed, 5 Jan 2022 23:37:43 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h2cFq/V3wwHA2PfCG9QaruC2axAyeRQTk0yQwEAnDYlYxdWflTbkZyFMuytQkICyH8k81Ir3WHkwn7W+MJ1juVQtgySA2c9xah9aL5z+mmCA9e9tDegcH1kcrOmokcIt09ZrSKArfm5t18w1stsVHvvKBnahepi0s7Xt/L8jjx1+P1N5RGpF0avcA6t9Jo+dohDBj5P6guN7yikR0h9dnUvND94E5aqQEoEsaSF+6ILuvPUochZBpRo/5UKgrjlel4S2XfPIV+Dme0vxDIEkLtfYHwLRzwENGTT0o385ocWCYiyTT7f6g4OZz1NXZ9R7x5LgXxaTfwpQfffNy6m8Uw== 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=MFannLh/I30Q9HYkBV3FojwkNXTIZw98lVhd3W0b5kM=; b=RFg019Xi/bflQyRp3WOebH2w5YnUxhM7t2PLZ/ep6qByJaDrT+Jl1NwYoE6Kd81Wl1o6hAZN/RRqtBsNI8wdz6Hq+8ICEK1+Tvwx/SrYRnukSXFcfJF1O5H1PCc1PbjCnxAS+LwXQnGCwzoo0vr+NDJXtrJg9lOKY1xSusrL+727nEp/N0PBmDXIdZgyKzXS+gmieM8EkUDjT1zefgaBhogwTktpVVCa7X0EWgZ3iLssRULxUqAS42VqaXdUwoHesTMdvjrFrbLeUCn+NlN4ph9wAiWcS5FbCraIu0rklykUfIqyuqv2nkQYARzIc3Tno7/Ov7s0YY3OKvb8Rf9omQ== 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=MFannLh/I30Q9HYkBV3FojwkNXTIZw98lVhd3W0b5kM=; b=JRaidnKA2mCzMC/8SBJ6xyPE86hTzA9y8hjceAdrxiw93G1ESoc/YC8nAKLVnbTR+JvVMHdVQ/q/q2ReLbsUh/w4AImHkCcUf34J6YPbC0uye6pD30fMkiyc5TdQBPnhYzQwNb3Q0oOA3n8KXxgh/ACtyAkViwbvXaLqUNpRuKvt9P2/E3vNBWX6pz6WM38jNVZ/rLwUmydcgA7QIecC4HbFZTp1PoVnx0WrBPK/6vPNKm0N4cqusvKtNzWxoh39d0RWUJRoz1k2tL50Xzk2arE6xXuUba0zpG9rMGErilaAcDqhiCGQlk3NEpwBm0iBLKUiTtna60nINEdLK3Z9JQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3959.eurprd03.prod.outlook.com (2603:10a6:20b:20::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.15; Wed, 5 Jan 2022 21:37:42 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Wed, 5 Jan 2022 21:37:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jan 2022 22:37:33 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [C2DZ50VK1f0OU5hRNljShhDmiEi7Q/t5] X-ClientProxiedBy: AM0PR03CA0048.eurprd03.prod.outlook.com (2603:10a6:208::25) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220105213735.732126-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5f0116d9-21f0-4712-f014-08d9d0939a6d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1Ja11TGJQaWdo/lkDKKZKtYSLzHkS2JnmsEE3UmSzvip55KAbwZKrSJNByxsDgaoxqxA3CuhZfGAMPedE6qPz0H7FkY5FYNr4qb8/U282zHKHYolxLxwULjkI5FJEJvAe+087bghW/V9q4mwUS38C2gfEbVOI5rhpUQspz6Boh3JR3ss36PYkm46synU4CEf22PQ16OxO7dwKYZ982IFh6IrokvoL/vIz8zQPwNQw1o8NpFopHC+7RDu28JW8iV+5S3D60FVX1vpmiMPiB9MvYcmJZtZZompRuhuLoqNywmsKcrE+8o7OA6gY5nXVsKvZTl6Gv2+X3+BtzK5LBk0z8moqn/QL3HTRURFWARJFsSpGyl93LPQ3fYyWFRxARDA0wnWiXpCthmz/+rZqMY5Bs2DLNsskLReD2St0IJuGI4IzvBn0992DM84ERfb/6Nop9vzS2L0hcaejNWLZe2N9KWFXNX2pmdZKI0DhW9GRhmbZZS6FzCiMoiau8BD0KTNk4RHQSMV/zHsuO/EZO6leYjdWn0TCHeICg0fWXft6c7nxo71u/ws3VMNzxqOrT1brCEs8CHJY0ictXCIB3pNmqYjh/Dt404MRUVErtD3jWRh2wWT9In8GMtk7ph63a//CpXn10Sn8p7WECrH5LP4V0ZgWJtah9dbGf43FJ9R4VDUYqvXZ1FooqwBgLENiRIcr38nFpWMNCJvxKu+sMVUxdnGH7qNl+mIJwE+Sw+GaVZcY= X-MS-TrafficTypeDiagnostic: AM6PR03MB3959:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cPtcqru9w3Dk8X5ZSeg6HgFbt9hp1fgJn+Thf8iplgloSvIpEcNixLCZiRxTOcF1sQ5gekk0BrjTrXE8LB56J1EYINJoEzb5BTMhsehjlY5zhyhhYAL4FjyVoYJ+1EMc3O1TJZEQNF6uMfUARl7IR5TILygCnSgIYoMIRdAA7llxR6V9tCY1ANOeNHe5/PP7YRN3usYwwFM3rRkzc5yTyGrVlSeoFLXD0mebp/68X7MTKdDrcE3wotfnS8UdddRjVNex1r6kid+y235NRpGCkx+g8rOd8cQr6Af2zRv4qQ2kkR7QbzkRnmTgIgiq7NMUMix3/DRSqWGL50vIj/P5ZLocYX5asuq1VGvo5PCzTU6bqddXwZch6xs4yeLC9S/TDOYyda7qYH+diLodiD0cGpODOESJlSecPO90n9HI+NdJOta4FuFSkOTPaxuQxfzgurggCJaVOnwt7azHLtfuLGH83h1hxsXMSftjAHu67twP3U001GOBU5pBKH6vA1Gyh3Wtu4KOTvCw8mVV8CZdawQE4NfW2LkZ925Dt4Ju4PmUmxlJKOCKPrLOjLDtDyOzOgCGUbpn13bogM35kuCMUg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uxkvogtnrfnz+sDcxqmNFLW5JBoLrgxIBBqKBub6+CoXOnn2Sk1DTrcNAZzGdmfYsuruIKmQg4prl1kl2+h//SyKC4nPprRAZxbuApZcg+wzQ0CH6kzl9Mss+P2Gb2WicsG0fla31Pba1ef54olQO4lA+nftPwBDbrV28a2JFe+BfzwEjWBEJYYJK6CFBckzX51y/DIJtXfyDUUNT93w1S7jtKoDX6AeliYjZ+PuYeRfg8bWGi8EeJuZ/gmPdmQfhpkzF+hhILzZzSLpJy1Z9/PB5xvU5lvNVg8D7xlfIRfIcwm2GuBa/uGDgj5628NVjt/w3FHcb3NGSrAmz/Te6BktAWgTh0FAIOeiGd2UE3FXBbydnsTkItILTSS/gAFZmQQCTsQngxku65MyClJm8piJlMK267Z5MbTMNgurMWQOnUwi+O6ttkxqpRwyIcOUJ5CcjjVxHE2d9d9rURUVWNZQ/+PWEBRKF56QrCyij9mR+zlmA5iLgcviaKPdvpoalhfcYa1D3EOFpB0fmMTYMx86KMT1PfJB66bbWgBT5hWGnGfWMniPHweU6fZBp8d4QcloatfkQU0xvhzMvwcsTsWvofsYBUWjwrRDrg+rUOE4N4bOIhmNTf1WZukjNcP9bVGkvC6WdKo6xXwVRM4T/lO9/i7BvVMDDVMG5544KTa7oQ9wo8UbAVQ2qyDzQE/WWHx1/xXk50huOQbcC3Rot62IwiAnCYGIuQ23tD7h/uoes7+quDCiyG+gwwyverDWR+TYYO13daELtZwKX7jQG3/qfnBQp3HPIdX7evbd5Y5Y47+3lvxKT4OJckUCkutiT+J14jwJPr8gVarkyqu1EsIbmy4z4BrrUUO0u40TbwkDPqGvs3jUm61J+Mvx3NiVm/XZukUW8lL+aWf2QzGB0+EHedhaAqbdkuXzT9D5GGHIvBPnceEbSbdt4dnpKsbbCWpDFmjqGGQy6ddha3oMtw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f0116d9-21f0-4712-f014-08d9d0939a6d X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2022 21:37:42.1645 (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: AM6PR03MB3959 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/takdec: Don't initialize get_bits context to read one value 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1qZjfGoTmCuQ Signed-off-by: Andreas Rheinhardt --- libavcodec/tak.h | 1 - libavformat/takdec.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/tak.h b/libavcodec/tak.h index dc45a8c070..6069118971 100644 --- a/libavcodec/tak.h +++ b/libavcodec/tak.h @@ -44,7 +44,6 @@ #define TAK_LAST_FRAME_SIZE_BITS 24 #define TAK_ENCODER_CODEC_BITS 6 #define TAK_ENCODER_PROFILE_BITS 4 -#define TAK_ENCODER_VERSION_BITS 24 #define TAK_SAMPLE_RATE_MIN 6000 #define TAK_CHANNELS_MIN 1 #define TAK_BPS_MIN 8 diff --git a/libavformat/takdec.c b/libavformat/takdec.c index bb256e1190..cc1f049512 100644 --- a/libavformat/takdec.c +++ b/libavformat/takdec.c @@ -171,9 +171,8 @@ static int tak_read_header(AVFormatContext *s) get_bits(&gb, TAK_LAST_FRAME_SIZE_BITS); av_freep(&buffer); } else if (type == TAK_METADATA_ENCODER) { - init_get_bits8(&gb, buffer, size - 3); av_log(s, AV_LOG_VERBOSE, "encoder version: %0X\n", - get_bits_long(&gb, TAK_ENCODER_VERSION_BITS)); + AV_RL24(buffer)); av_freep(&buffer); } } From patchwork Wed Jan 5 21:38:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33097 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1101166iog; Wed, 5 Jan 2022 13:38:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJz5mizvuzuu1OzeOhPecEYLl/iYTjdbvfL8boPO7gAlHN1rPljf1qJgLU00I0dT2iI4X7r8 X-Received: by 2002:a05:6402:1691:: with SMTP id a17mr55282249edv.109.1641418733521; Wed, 05 Jan 2022 13:38:53 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z26si23189ejc.578.2022.01.05.13.38.53; Wed, 05 Jan 2022 13:38:53 -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=@outlook.com header.s=selector1 header.b=dBdaLfk+; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CAD6E68ADE7; Wed, 5 Jan 2022 23:38:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2093.outbound.protection.outlook.com [40.92.91.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 04B9A688093 for ; Wed, 5 Jan 2022 23:38:44 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dt8LdGESnK5F9QAQHuDshF/2qQLYqez9iAGN6assm4RdT/XQ9VUMsFZ5/JariTOFoMAij3RI+MXjnBbVl7DD6oMPKwEno6roCtMau87tKqCdlzSsZjP4BREEp8+8s01A9cWo1GjLAkkYBb6gktUczoAnLpgAe8UOg/MqJOULaGwVWdtiw26NkGyx5TxB1aewBcWLOVKpl3h2wQrhWZc0E2MLNwJ/OoeMsru1gehNYbtkRCaITnUrnf3U3w55QSe5SADoGtmtr/BiH8C9nRodapKhN5AItiDg0LiNtsw1A9Fg2DeqAmYwmqFwZccrloMHC/zHGAOM/BCCTKzzPq2hZA== 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=Zspc/ZUdF/IgGjVoiIC/zW+Tt0DOXfxNaVLK7fQhW5U=; b=Jy5WNX4sPpBkqPZok4l7dv6sgGGbDuX4JiQY4LGltRnE0d72S/Z0jiCTEHM1KVx7DCv7uWTJOUQl2AqHpGIuAJDVjmS1c9UiIQrthG6bIQbc5jlzCyE1Gy8xEGbnCBh9+M5XUJv9ihlu5hmaaIyoF5pzSLHFfUaAjwBE0I07uabj5E2j4i4ueZ3gSuKXJ/FMtkq6JOOIjFlbVUyVB0V5vHRLQyJUEEq4Xx9nRVuWfNgxl7slv92w63o/gkb41Pf/s0J+6rV4mpOhAEw16oH5hutOUe3F1YRQb7lRTNVn7JMRszPqqVUCbqrecCp1QtKbFM7PwjcZJ4fbXQpp5IVhbw== 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=Zspc/ZUdF/IgGjVoiIC/zW+Tt0DOXfxNaVLK7fQhW5U=; b=dBdaLfk+OsJ4LR3Qe3/DUSHml1JzYjy4OYkF9GrmwrJzSCLRhsFgThfqICbGL/Kv92HupwHhTF4og5v8WjqSmBkcoyc0eQoa9/6rcg7wmozJyJyTQApOMeU12dZ8OsCqtwYX0kXzPYNN7DE9Zlzpwo7gYa5rzvFyF+QNCelkDXQE0ptSWsK4rehDADWxmOE2asiG839BO7eYVEdo4sh16iKQcmMyEVa3JPqqy9itZk04fYQgSJT60ZvJ1hWvjSVbEmjpcFpb36+ER6mRF9IloYAGd9cT1hJCoeOx9g8uBPweAMfoVEX/YhCPwRvydhSgbjSNWmsh5O56FHEsgKrYLg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3959.eurprd03.prod.outlook.com (2603:10a6:20b:20::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.15; Wed, 5 Jan 2022 21:38:42 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Wed, 5 Jan 2022 21:38:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jan 2022 22:38:34 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [yxMZ3ouz8i8Pjb2zDT/aZ1kFzfATBsbD] X-ClientProxiedBy: AM4PR0902CA0018.eurprd09.prod.outlook.com (2603:10a6:200:9b::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220105213835.732247-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eac568ce-da48-4296-f2e1-08d9d093be87 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1J9/PYC/PnwrOOca7vuYflwCqYuAUcIP17Df7Z7CBwv0KCc/45gcMRBvSaUbOZQk3FztP+b39JjNc7i/d3Qi2TnsmsCl2fIB4yOTcNgFzm9kauOTt5ihWUJFgo5Sng2nI5fTx+goozzRz7UZhLEPq3ncSqnnzQ19XKzLMnIUdU624C9ej3E48z5xrN6HaLDY00suEbaz/XS3KF9+bmGkpXdxWV/YFdM/38856KY9gc1xKu1KsiHAL/5H+HYGY2sM7DGkQEa/o6GWArcXQxKS9JZvVCZE9pijndeRKmVPyP8XoyOc5oUgwGfA3o2QVc/815T/Zd0sGkzqQXhBxWCyNOK82Mdj4MrXeXJBGFZ4mba0bIBDf4BmCnJyBuKVQRCgF09J7zdjyqRAvhOH03VrmlE3K+cgMLQWlwpG28I9vunspGdUrA+aMI2h4GYwmHi38298hLThR9PscNBiAxwDaHIr1qcMhmLPbz5Z+aL6AtZTseK7yjIuDTepZiNHNmZU5291KHOwUKR8+FOMbkT2Z/h+vPeynDtQqYYR2BR3i0iUHBeLfQTIgUiU0iKNz9hDXpn9H2DaPVgFRxJA/K+NmjVIJUACHN2XyqZSL21PfCe3Iuj0giCrfE38BL7r5driabLOz6riP5LnfxgAQm3iZTJdLLzpbbyX+fsUu66nNOVFjQoJExxZ/ItPQPK4x/gOJ3MaMnn6YiSScpG0EDFnFIrDKq1CgAs9CBcO0W2Gx/Brk= X-MS-TrafficTypeDiagnostic: AM6PR03MB3959:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6qzk5BmVT4j+Ev7f+6ukSlEjx/jIOgsDqSZqTBxio9keU2/iYoEUlRvM4GqnLmkZn/Lhmrav60WnBi/Wm2UewUYhFOTJ72iapnhAjY3lc64076LNn7QJjnRiRan00C3RJvd1ERrdDjRAf3MBsrgpjZDe475EMEi8DycVB4QPFodk15KYNlXGu0S5CRizNaLKea6JELMQ4g0RIjivLv/OLI0eIrfq46CJtKSusnEI2CsWYFt3e7HzO5Sfk75D5oMNRfNNUJtz2LQ4k2Zn+3LLT0ck2J484/WH9lo44DNnFgA/gVijZSPIbn0TfV6CrxMkH3bCtTgTZ6Nu6/GN/g+fqXQzCNYcKUFrCriYId115lD2bR2IccUeOBS6ghSl2AAFZXJU469juZPOFYTWIWHYaU8FlAd8asDIZEWyBGjIgaFrUWf3tHHuUYSetCYlHorrXj+GuycTbbM5EMdh9eeOw+G/tXacYEqaeRHUuYvG8teL5f8nS1IAPHxMicOMXSQKzxWmnVVodKidS+v7H7PtUUUazYZyRteXXGyWyCicpnYgCWG5sCcoRI2wUOMUAsI8OAK63KBv/3kE489iArqzSA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JJxCbEz87l/z4zlmb514cmsH23zakv4rdOP/Q4i/YT/cFlH+ZcwLy03ibeb3RJ3BWwF00E/9AzYP1F1zgoKnbW7xr24FUWAtHQ93jo6BdpXrVqj5JELO8TxnODC8yJ/Ve/OAVF/KMJtzQjya3RHp7zfOOnqbp86ZZ6vbHEOAYgUQWUi04V6ldWctNuaQpxQpp1YkE4quAfTy+u61td36h8SpIMU0M1N4skHsyI1fvfTaT62mMpbl/csZv3gI6WSui3tUa/U+Kvmk4cWBgyntghZ1Lv6dz7yJa3LJMozkDrFx6uWagb2v17Y2xwDlwB6c7AmXVlY6lQCKyzpTzGjlMS/RItRnWAy+dWfari6FZ1HRe6toBashYf5ObE+QkjSp17wpqGzRD724LV6GIg4YIJOhWvz89YKhPGVQ+sjRNoY33ZwTXhV89dSOJm4ZN8O+Ua4o5lp2zq+ZqXSQLYe46d6D1J4s65BT3e/jc2oqJyIkOHwgBx4lwutSkwIK2LDUUyIZ7jdYY9CQVNvApLfZ+FW8OqHX2NRTrJoi+DTVBIFcPdHs4yourqFMTaCxQ5+/SGl5QkBb4TntHLbP6A0973SWDlyZk5TnfuzngDGi2oMTWL+pxP2MiiMUGAtUA4upvXzfVt6M+1kQej22dNYzT+Lc+gGf1zDQFrGkvpjjrd/do92I7OCN6wNVpP8+7CfoaisLropDDPyVSEHV7PcwH+Av9pN4TREn6guDFnZBPr7WzW+ekL5PIJjd+1qWNVicZLiOQv/sKTnMwVIXaawZlBwkILwD+3HPKiKV8YfcEDPXYyfOKi6dAgZg+Ikl2NQuO7sR4LjC52etftYMEi6azs4CV6C6wgb5aA25yyJv63qlr4+F0GIiW29IqSDmR4g9nyU2/DrcSIC7ymwg7jkjOmFS0bYe1htH3y1EYYSKS8ZKQL41OKssmsZs4Us1dCUVGqEu5uBmP7tZxoEvsH6uFg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: eac568ce-da48-4296-f2e1-08d9d093be87 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2022 21:38:42.6874 (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: AM6PR03MB3959 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/mlpdec: Use get_bits() instead of get_bits_long() when possible 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: h8T13SB2exRK huff_lsbs is guaranteed to be in the range of 0..24 and so is lsb_bits here, so one can use get_bits(). Signed-off-by: Andreas Rheinhardt --- libavcodec/mlpdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 29fac54542..61b9a641dd 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -268,7 +268,7 @@ static inline int read_huff_channels(MLPDecodeContext *m, GetBitContext *gbp, return AVERROR_INVALIDDATA; if (lsb_bits > 0) - result = (result << lsb_bits) + get_bits_long(gbp, lsb_bits); + result = (result << lsb_bits) + get_bits(gbp, lsb_bits); result += cp->sign_huff_offset; result *= 1 << quant_step_size; From patchwork Wed Jan 5 21:38:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33098 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1101355iog; Wed, 5 Jan 2022 13:39:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJxSnfyqDSqLFU91p9zEj/mm2TZMdXQBl4q7CkLXZ8QC/xCFdykef4xXf9smCLls+8/l/GOO X-Received: by 2002:a17:907:a089:: with SMTP id hu9mr45464881ejc.448.1641418754771; Wed, 05 Jan 2022 13:39:14 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sb38si22388ejc.620.2022.01.05.13.39.13; Wed, 05 Jan 2022 13:39:14 -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=@outlook.com header.s=selector1 header.b=ri4MLBXg; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E811668AE34; Wed, 5 Jan 2022 23:39:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2030.outbound.protection.outlook.com [40.92.91.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C5DC16881C8 for ; Wed, 5 Jan 2022 23:39:09 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aVgZOCbGgL21N+CwG2DMsaE9oFej++FLW5IO3Nj45ZlnZo2Nmrn+LZw0FzOeQvFuX4r0tPTOIKMqxCcGGZRjir7+7TrNZXhqbegzkdDJ3YS3D2fXUicrzxc1ATUBEjTMXjpOJgqsu/KYlntIF+Gk8Ui542Vc6mnMbBWYtNq5iDSzuB1r/YCsv3lktvaZFVdjC8Wa8z6PN7++rNTjaO8xRdy9rovavVKklZpNDiDMnvflfg+dhv7n0jpy7595v7vxh+eKXpfO7UkAACDFDYdf1T/tGykIDMrCnVdO7ckMF7/8JPeR5Si+yCNfWl1lgsC9RhgEv4KahwV4lQu5c0dzfQ== 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=Xmdw7sBZFJ7iUXydMg3mxqhFpr0Hp5fA4Ikk5NaRhTE=; b=D2cEJDXqP/2rP1GGS++RBGm0ZbB6dmJHSKJxO1BhZpwQS+S9xiU7Rwchif8NaKTfr5qHE4o3Ti9RwkHHA76PVGjcNUgxouC4wRIjzGbHEaRxH9EGVsOVwn1NpXKVLoDP2WOCWTDmChOsZWudvkCctB/qJ0jNvdlrtBQ5oQXSC1D9RQC2CSwsPFy+6cIcwetnBmbNfKw8X9dpx3J3VKdKp266BOSZeTs5juGXgQSbVHw2G5pqvlJI0A/P2CLS7a+9sXJHh79U2VikGLU68A9IYn9bAyvFc3dHCP+A3l1CLC3SOpv1u4QHm19Ph9zWD1qOvNxGonfSa9Oe3Ea6zLgnoQ== 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=Xmdw7sBZFJ7iUXydMg3mxqhFpr0Hp5fA4Ikk5NaRhTE=; b=ri4MLBXgzKmeu2Rh6bW2vmtj1WyvxxbUJ/pmty5nFrN62ZLftuEJInTVwJe6lZpeJOw6AeNumDG3DYTTMAOZ3HXJf8XQMmgxqBKl0IyeON3WU7Eo+E1YhMOjwO76EEjyvJTfVdNN+CadnBa8tmXOpptwhxNi53KiGzvn9ePpNEdCBZHqVWMC5GQ5cGYTDttoHwdEtXHC9PoVImzPFv9yIIAVm/V2wyKDAZosK3KmNiEt6BV4uggx+lWDMFo2A0PUsxLP/bhIuFzhIx7cfhsHRPO2XYabGcjeEDPU8//7osDXqbIl29aKSKN66/fcxSMvnQDbq5HWTrSRbq2zi8euyg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3959.eurprd03.prod.outlook.com (2603:10a6:20b:20::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.15; Wed, 5 Jan 2022 21:39:08 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Wed, 5 Jan 2022 21:39:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jan 2022 22:38:57 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [DrP/DKq2dEr0whRIbPtr1IyUczRLEFCg] X-ClientProxiedBy: AM4PR0902CA0003.eurprd09.prod.outlook.com (2603:10a6:200:9b::13) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220105213857.732312-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f3006ad7-9c2e-4d24-d8e6-08d9d093cde7 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JV+MSkOQrP/fLRNZgglVpZtXOx9X6+nppREVLtJLdg8PrIKfnU4eunbWBLMDFhGqna00Y+/Bdx13w6eWVFRxmTXZUNVVZqdS6bmnBF5uYCg4f4uBRTnHw+RU22cFEScj+Y7mdiiPWCjukTp1EMA/0FrIgu7rIqbFP4+KVu//55eGkbTexbNfCiQQdjAfEVuMKJa+8nV3/01VjXf61MQrG1gcvbc+QKy11xnM/1EkGoAnZDPscSCtH9H7yTvMv/xFinBruAT0fhHSe/sOQ0+HaXdxTiy+JZViUr6LKqBx9sFcs+MSg6dp+hmyTvZjTIvo4WAxnEUjrzzVi5yIgCP7SmuQZf5deIyycvaDQcJs1vbbEvKSi7e7bbWUq60CgV1paJVypYMcS8FtrLIRz0KNlbeRHM/LycG+SM+GuUXfINUVzOrxpvlidVl1xKUIIWzPb9yL2d9NcGjLHxaEdqUv+F/sTYRBNGODvEhL8MPVvgNHlUvow9dDFP1uhjmuaFYLM+GjTTZ0/iqZltCh1VBz4iN0JBS1gO68roTmDOmCAFMr6ToO/3rgO6e7mjQvAWZGlfyCGLm816FDXZe/tr5P3Wtp6Z95uf0CVfQjSGubC83mY9EaghZqsQcHKF8rCgVhIBnssuJmx69IZjF5xjZMnqOm9HXIuutFzo0MCL+rxVcFDE0szzPRVISXa1RfddTpcWRxR040vSDX2w4CHyLrVE/E2vBR0fQ1VF2nzXspUajE= X-MS-TrafficTypeDiagnostic: AM6PR03MB3959:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3DOJSOvejb946+bdZ1smir+GJbe7lZ9kvdtI6xP/9bay9HK4KHdlbeO262QLn7sfRT7LudWoMG882G047o1Mjp4ufW7O84jhmHcWhKwjubiclZufyYlY/xVmoc6fjU+ruHQJ1lvFA2lJkZOSZemmvIkc7AfziQm+WaDDdrfDg9RAqWQI2f0WHv4ADvgBU/o+QZOuhcZB/6x5s52qq4GAOcWhe7W79SFIkfO97FNq9Q7oQ8YoBslZMQFY/pnP2k6KDGfPvXCkItkGLkYsdInJx+YIIZpCjoP2qhElV51gdUkGztmPxjUcIMvLnCmx/YBb40kVENmx/nXfnUzjk9cht8kJKPxqjjQq06Ls8GFabWs3FQ4ME/GMD7Bnrpc+5moseXho7qdnarNyuy6+u5CnRzLkXlXDuR018yk0q6iTR4lYs8/4GX8CRdFt3s5qgfNFJsRKyjRkmTcP8U8L/IDKdUVW5/c/wy9Q2QTMfPwlxxlQ67FSFmKt7SXhQ5UcrEP/xgAdQp5PlfX5prBAKMooXH57I2lglqLD+Ez645cY1H3y9E5IkgoF1gXg4/GVlCHK6ZNmb83HJx0XHRbwHZdFqg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uuVFfWEs5GkyGTZiUr+6ik8nb+u4zm3w7JxT1lPbf6LP6VOziI65/zF5kGSj7fEuM5tG8tHbVG3ONp5fXeZ9oCsr4jz4Q96V/Vr5Q30RBLKC5yV6xGviAEqzj9oTmi1RtyW8BW+Y9N9/ccHWbNlg6QVgSMBsdFMHXEfOo/om+p19vXqPfC/xZYTozE2XAdkBSPxqg344athVm59iM3v/sLOqOOawZEOmodu+Nqt6Hv4WU53Gq8DNwWi345HN28jAvOPOV62mxn0Bu3yzlsgC+hWyGuiuPbXdVmSmWL6BRSPWdLq1ag+s6xr/42XBH9yukcrRefE3AjUK/LfaDuB3yHXi8rb9wri0FFZUkbq1fLDYhahwONgBfDNTB4d7ryKvXeZy+SpYD2Zo/sspZPzAH9F9oJaWVY5+OIPUjsH58Fv2W7cVIocGqvbszYhyrbWcrRdr654J/W3mv+/IMy64NWcZwHffpRS2Aehvm0zIR3+A5TRfCiytZTafBEhDpCmtdc+c2XrwNvXIkSXih5SXK4NFwu/zBLtfLOUnxqm5/dmy7PYHGzrg3Ns/BPnKn63I+4wNmoNg5f3+eDG7/JxLqtwAFZiqj1GW1Jwe6V/aNwIXMhD2Uuh7Vvsy+NA7cHDP0SuDCnDbp1DaWSH+W8uQ/J+G+sjt5V5AmKU5vEKj6wjuodmmOZLx51vCCvzyKouTFDuilQm/h2Xq74tzF98xMx+in1gtzRWRSXPU5/zG1kXK1j+qJSvwNyWIh3HKDyuKuoCpVJYdbr2ZejDdOJOqBLzDwh16JDXF+q5Aqvh5kalXivI8t9PLvuTKNSyk3o88WeDe7FM0cDeSSDKbOdrhBuLViVFuHW+WkzJnuVBMvU7VZq4831SLJ49u9x0dQfY3+KiuDiK5BhKAIj+J6yjXFN8aEN1Jrkd3ln3pLbVTfFglzrE2oLdyprPsf7E0AOyH7SBodFyeu7XTymbjK09zhg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f3006ad7-9c2e-4d24-d8e6-08d9d093cde7 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2022 21:39:08.4804 (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: AM6PR03MB3959 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/jpeglsdec: Avoid get_bits_long() where possible 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: u9N9iU5FDOR4 It is possible here, because the values of ff_log2_run used here are actually in the range 0..15 given that run_index is in the range 0..31. Signed-off-by: Andreas Rheinhardt --- libavcodec/jpeglsdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c index 32c0d2eb3f..269c71dc18 100644 --- a/libavcodec/jpeglsdec.c +++ b/libavcodec/jpeglsdec.c @@ -277,7 +277,7 @@ static inline int ls_decode_line(JLSState *state, MJpegDecodeContext *s, /* decode aborted run */ r = ff_log2_run[state->run_index[comp]]; if (r) - r = get_bits_long(&s->gb, r); + r = get_bits(&s->gb, r); if (x + r * stride > w) { r = (w - x) / stride; }