From patchwork Wed Jun 5 12:24:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49582 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d792:0:b0:460:55fa:d5ed with SMTP id db18csp346643vqb; Wed, 5 Jun 2024 05:25:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU3IKRQ3UdFv7/ZW3CIzuwc594HuWtuEqiZr40aMK/ZJbD6oyMRz6XPzX9cKAHNFbMhoxvxu46bQcG9paUixdsXt9rvGVwNzgm6dQ== X-Google-Smtp-Source: AGHT+IGKLN6Uo+a/VT++0LQ+TnPg4V/PnCufmtNfxOqC0b4kRPOyiOIbiyOU3Vnd7Fbqsx99b6/l X-Received: by 2002:a17:906:fccf:b0:a59:bfab:b24f with SMTP id a640c23a62f3a-a69a023e515mr153050666b.3.1717590302326; Wed, 05 Jun 2024 05:25:02 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a67eb723043si573084166b.924.2024.06.05.05.25.01; Wed, 05 Jun 2024 05:25:02 -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=@outlook.com header.s=selector1 header.b=qzF562zm; 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 900E468D69A; Wed, 5 Jun 2024 15:24:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2106.outbound.protection.outlook.com [40.92.73.106]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B1A1568D275 for ; Wed, 5 Jun 2024 15:24:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n+lK73Szhix0+UVIS3tolZD4g6E6pd8s/7gU3wYLsppWfhPWy0AxH79z0HZ7L65wJR5VuDZtFLdxy1XFkKHMzARknE7DUaCkc8SXs5J0dgH5LykfZw3lgAU5STG5iZgFsa6qEaWUxl86VXcPj9Wplu/2MJk3fnXzlHh0XDte9TmyOnCiefXeymcm/90oZer+9cUpjR+c7fnAo507gYkHhGIX4lLKbfF4zheImwCJK7+PtN9YpX5fUrBo3hptHE8A4RwaZK0BBxDAF/MCkfGVoNPBA0OqX+qcSFAJ7nVNBldL7ZdtE5QS/YY1ya9TOgabsSS60tiTT4XJbwRAzfpmOQ== 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=K6ZSQD4pTyRWxMCNJfmInCqtSoZPkyXz/d2Jkb7GNhM=; b=R9lnxBCiN6Do0IVO5JZ/o+gE+DD1uI9HZiaizULDWPhRG1Wd9Rf2IaLKMI564/tRxhZ+QaZHaVZsAoqdmJodBqX4G9qbowoyqq0AzAtPnmV8EbQlXWJnkrbzoIHcLJDHMeWkzUX61qohxeS9cZa626X5qCT+LOFso2A2c4mkXo7t74Vi0Qfd08P8R50uOxASU1Z9HgXGa1NfB5NfhqoIdGwCSKbjikUmTokAURTe3cq1HjTnyq84IxEXtfmCsCkdILzSZO9ewaS9H5FuFeYsAfzcXQ5bZcSghmgMezIUWPSmlQZbVTqzxIgTTaPvhnaEQWqp5YG3KYrlr0aeW+pggg== 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=K6ZSQD4pTyRWxMCNJfmInCqtSoZPkyXz/d2Jkb7GNhM=; b=qzF562zmVnEp504hIZzka/Rq0c2E7gwHdbPD3HOeQFs+2uZRx2YrlH2kyRujTEfF3R13PFVyxp8Hi7OFOHhuOulg8AV5jPcq+CftLl/dOaa0UZsDbOSj9nAfPKp91vqh5NlAASk9oevtMe5txPjsmc3188xERPnXbcQcbDt4OTwm+2QpB+ClwthMAlij0sqIN/U/4UAAwlEA4pPdCdgs3gb4SkBnorLUHO6zitDse51Rm8JNVsxPzJxT3PWepxehfMbG/Zlr2WbB54vxxQr95y9mIyd+OiaQdpCo9PLk+3iCv5zx89q39MxG0vG1ttduXNXMtlsrRF/1s6EYNHjuPw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU0P250MB0436.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:348::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.31; Wed, 5 Jun 2024 12:24:50 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%4]) with mapi id 15.20.7633.021; Wed, 5 Jun 2024 12:24:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jun 2024 14:24:42 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [sKv4leUAE6Sd25WhbnbLzkY4Rn0KDL18jWPmPnN2XNY=] X-ClientProxiedBy: FR4P281CA0102.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:cb::9) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240605122443.1887470-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU0P250MB0436:EE_ X-MS-Office365-Filtering-Correlation-Id: 079ce7a8-fad2-4b2b-44aa-08dc855a7ee3 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: x+H3upMl4b/P8VFFa7nJR3E3PZIxZlv0sSMvlFsc7oGUiY8DT7weHvsLSsaANlPzjnzzattDW2x7ljCUqpCtqg64M65w2xKCs1rLYgnIwuTE1qW9WIIQMJxYz2lbLSFYx4X0VJClJ4mSCc63ds/HbAOWczgUr5w9Txy/yV+M3EcGtCxOwGdSXS0MszZo93ecvBuZD5PHrHXMCI9wSCl0kKeb7MC/Ru87AiS1Qsyntkci+DlNzMUuXA7LNyaygj0R01rLV7NKIvaxVZGIxrNcd0G+DLdqz+fuNwemYY7GUyxTSivYNLZ//LCaLDC7jOUoPAEXp/mbl8uSQ3I1Jk4QFQ4jbfoKptXM58ZY1NhP34jrRry9ZWl4SJUwt0oJ+uYfT3YS1J1DmMxMGd1Gmo84tNzslXuJoGWlo84axq90Yxfz8eBfr9cKg+gM0vVwzJEz0Gftjk4AGEIkh7/Jef+jLbtjGEMy6iNBlTakTYBB4WlQnwdcn+QwYI7JjeX5+AcEIddLQ8nErkk0gKZ+rxc51eXbimYYsU7nqs4FFJslRwPkas3dey7aLWvLq3TvM2wGVGWqa50hD6q3kHvmsjEpTysFaoqotpiz9yP6DZCtelawxCTfKprzFX7To8Kuyu/5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YWAnhnEN7gjFGcGKC+JkctHjd8wjCULUjHQyrT8Ae2m091XS3KycFgNyyk3Iu2Qc8CldTtMnyflHGGK8kgt7GeOpIqvdkF2veLyvJ2KczCiNNhTtc0Qn9ayepl1CUx8yZ6igyviKhfUdJl34hLw3w0GRt7rlcwvyx6H/H6+SnyB/7aGcd1aXqVVXEstsjkPaY+88IqnnQxSvYlTvpRpRNtkR8/urEoYkYXZFAn0aM3D4C/MVGLiav0YHBmmn1/w+viAnArUzF1cTWWAWVa2AjWAEc8GSsHyOKIvdYNNVrZZaeVtvf69ueW2VyOPtr+4mfQA8T+yeehsKKJTYXVvNgL0gKrUtadTdw3+tlnngksV5zTLmGpBgra0GhqXMU7+kl18792WqzYCiXdEYseKrWkvJKEk0dfZPHweh2WSiUbjOKRW8gXg9lQ+DmPH2f277kTSxCjReUdjEV8aK7+7GgKj9k66tpklmssB/tYClAkQaEtH0Q9zrK67HoAodCdgSMttHUk0A9OPC7//DfbKk0PfiY5dHc4vUOJtjUZwRla7DOgiR3SkMQaJ0heDNwAZxEizgFUVU/X/R0poflJOCUbW6XbYFuwvt7qixus8hC/LwZo4TWyYCWamcxE/1c1S0wTOzpdjQN0sPbi7zOMrI463rhuR0meQi8ZiJhqY6+s/GEML6a+f7Jlfl9Uc3OHwckGNGq61LOYOQiq0JQpUg5Pij6IbUHriKBbTZW0WTa7tLvT7DQ5vkTu1k/6RFd347PQfFhu7ADXg1LOXObh1uTttefxx1O0SC8b9lLtGcnKW3DKei76dKkYXhgbVXKTDcUsRGSM1LhWYAjBx6V/HMEEz08pm+1xqNsphP6Yg8GsyOpI8iZ7vd4do5/SGUE736kH9pRpN+SkEMWWNKXlYisOBUb1dMkELQoVPFFXpUqDTuXPjgDPRtpEN6MbETRLwx5zx358obqb3sueq/NBLG7u+QBaxElvnbuaali7t0s/VO/5iDQSCLaQznOoNpi63URtN6Au+uel7ODs0pd6X5K3uHzkGqrEQZhffT02I9kMUW6pbmHpY2wTvkoppfVQQuWFLEqRlLX2bq81Lz4sy5aY+35xW/kMN5pLQtTDFEV/5TKtq5MbsWi1FPGIeRTGGquujHf2JXnIol/SIpXhCcHYl4bpd09wHE3hRTxdmQTqxQ4s+sRxr9nYaB94RHBEjbMFSp0PPrdzxC4LZ/ZHAM6mAgeQKK1mbWHGl5VOGXI4cUKu1pfmcPO48AyOmvGKzUy1voDcMvvMEsyeCl7yUPvA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 079ce7a8-fad2-4b2b-44aa-08dc855a7ee3 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2024 12:24:50.3923 (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: DU0P250MB0436 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/dnxhdenc: Move PutBitContext from ctx to stack 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: EYyqpUnRKugb Signed-off-by: Andreas Rheinhardt --- libavcodec/dnxhdenc.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 0cb25d7714..4760a2932c 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -559,7 +559,7 @@ static int dnxhd_write_header(AVCodecContext *avctx, uint8_t *buf) return 0; } -static av_always_inline void dnxhd_encode_dc(DNXHDEncContext *ctx, int diff) +static av_always_inline void dnxhd_encode_dc(PutBitContext *pb, DNXHDEncContext *ctx, int diff) { int nbits; if (diff < 0) { @@ -568,19 +568,19 @@ static av_always_inline void dnxhd_encode_dc(DNXHDEncContext *ctx, int diff) } else { nbits = av_log2_16bit(2 * diff); } - put_bits(&ctx->m.pb, ctx->cid_table->dc_bits[nbits] + nbits, + put_bits(pb, ctx->cid_table->dc_bits[nbits] + nbits, (ctx->cid_table->dc_codes[nbits] << nbits) + av_mod_uintp2(diff, nbits)); } static av_always_inline -void dnxhd_encode_block(DNXHDEncContext *ctx, int16_t *block, - int last_index, int n) +void dnxhd_encode_block(PutBitContext *pb, DNXHDEncContext *ctx, + int16_t *block, int last_index, int n) { int last_non_zero = 0; int slevel, i, j; - dnxhd_encode_dc(ctx, block[0] - ctx->m.last_dc[n]); + dnxhd_encode_dc(pb, ctx, block[0] - ctx->m.last_dc[n]); ctx->m.last_dc[n] = block[0]; for (i = 1; i <= last_index; i++) { @@ -589,14 +589,14 @@ void dnxhd_encode_block(DNXHDEncContext *ctx, int16_t *block, if (slevel) { int run_level = i - last_non_zero - 1; int rlevel = slevel * (1 << 1) | !!run_level; - put_bits(&ctx->m.pb, ctx->vlc_bits[rlevel], ctx->vlc_codes[rlevel]); + put_bits(pb, ctx->vlc_bits[rlevel], ctx->vlc_codes[rlevel]); if (run_level) - put_bits(&ctx->m.pb, ctx->run_bits[run_level], + put_bits(pb, ctx->run_bits[run_level], ctx->run_codes[run_level]); last_non_zero = i; } } - put_bits(&ctx->m.pb, ctx->vlc_bits[0], ctx->vlc_codes[0]); // EOB + put_bits(pb, ctx->vlc_bits[0], ctx->vlc_codes[0]); // EOB } static av_always_inline @@ -879,9 +879,10 @@ static int dnxhd_encode_thread(AVCodecContext *avctx, void *arg, int jobnr, int threadnr) { DNXHDEncContext *ctx = avctx->priv_data; + PutBitContext pb0, *const pb = &pb0; int mb_y = jobnr, mb_x; ctx = ctx->thread[threadnr]; - init_put_bits(&ctx->m.pb, (uint8_t *)arg + ctx->data_offset + ctx->slice_offs[jobnr], + init_put_bits(pb, (uint8_t *)arg + ctx->data_offset + ctx->slice_offs[jobnr], ctx->slice_size[jobnr]); ctx->m.last_dc[0] = @@ -892,8 +893,8 @@ static int dnxhd_encode_thread(AVCodecContext *avctx, void *arg, int qscale = ctx->mb_qscale[mb]; int i; - put_bits(&ctx->m.pb, 11, qscale); - put_bits(&ctx->m.pb, 1, avctx->pix_fmt == AV_PIX_FMT_YUV444P10); + put_bits(pb, 11, qscale); + put_bits(pb, 1, avctx->pix_fmt == AV_PIX_FMT_YUV444P10); dnxhd_get_blocks(ctx, mb_x, mb_y); @@ -904,13 +905,13 @@ static int dnxhd_encode_thread(AVCodecContext *avctx, void *arg, ctx->is_444 ? (((i >> 1) % 3) < 1 ? 0 : 4): 4 & (2*i), qscale, &overflow); - dnxhd_encode_block(ctx, block, last_index, n); + dnxhd_encode_block(pb, ctx, block, last_index, n); } } - if (put_bits_count(&ctx->m.pb) & 31) - put_bits(&ctx->m.pb, 32 - (put_bits_count(&ctx->m.pb) & 31), 0); - flush_put_bits(&ctx->m.pb); - memset(put_bits_ptr(&ctx->m.pb), 0, put_bytes_left(&ctx->m.pb, 0)); + if (put_bits_count(pb) & 31) + put_bits(pb, 32 - (put_bits_count(pb) & 31), 0); + flush_put_bits(pb); + memset(put_bits_ptr(pb), 0, put_bytes_left(pb, 0)); return 0; } From patchwork Wed Jun 5 12:25:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49581 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d792:0:b0:460:55fa:d5ed with SMTP id db18csp347211vqb; Wed, 5 Jun 2024 05:26:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXFy4/xEieDMttB2awshA5xD56FzTEN0bu3FS5VLa6TVOnGddVj+lq58Xg5zyPVjzUSZqV4HMOWhEU1Y0aq4v1gEshXbRWesFLllQ== X-Google-Smtp-Source: AGHT+IFQPU5/YoyTKn1UmMqiI0GibtHV9K7Lz0AGcUdvS6Hr0ekStH92o/CB/710yjKAuZPd33Qw X-Received: by 2002:a2e:98c5:0:b0:2df:b7cf:9607 with SMTP id 38308e7fff4ca-2eac7a01984mr13844061fa.22.1717590360011; Wed, 05 Jun 2024 05:26:00 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2ea91d32325si35652031fa.382.2024.06.05.05.25.59; Wed, 05 Jun 2024 05:25:59 -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=@outlook.com header.s=selector1 header.b=Z+t9nSw0; 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 C711968D6A0; Wed, 5 Jun 2024 15:25:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2015.outbound.protection.outlook.com [40.92.91.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 976EE68C371 for ; Wed, 5 Jun 2024 15:25:48 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Jj21gpV/wZ+3GWvaJBZPrR8dyjHndw9hFS7Is2fJxgKXS4a5DPyYhOLu0e2xnVa8g79OzhqMGu+v68oCAE0X8Gq48go5eEYdbVg4DhuZOxXUBuVWB6NantR5zCvYHFBRQuggRBkDZICIOaNjUSCBt5DIr7FHPDKNpKzFFTufCa2/PG27/lrLX1I7grPCiotWKpnysZSuKh+39Lb2eaYMQiF+IBzVKKhRYXw0WWa6ewf/y9WVV7maeaSkV3IuIn2eAQ1s12qBB7cQZdeVNmCfGUJJOPdwA8160n/P2WncQpdJQYJM0o5+xtmkpBHrxyQ92hMunlQa6xKDiBzmIYAnqQ== 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=qKsx43a9ZNmIgLIDPCeMMkwl/6aS9tL98TujUOkCBUA=; b=NMneR1+oVpVIp3ABmKXYzrdVzWcr3JfeszC4DgxROPWHwnU5lgFjqgUAlsAlmIajOQJbwV2uZcvKwkSWbhy5tAkPA89HJB9P1YdC+MjR+t2OYIPWLGvEdHvycDBLP22cQ/nBmlSt4vWtR7m/gvp9DoXCqeX4wk/TdZUkh1je5HhQa3Q0dC2okzdujg4G5t+Y9VhWJv3jjGWqv7bAR0JbjnMygonNDMDoXoUMe3UytLl3Vg6NZG1wnU2uQOQJXkrRqfkwB20QXSnAX2uFSKO07EJ9M20A3zKdsv2dezyVKVbd3+BdI40Kb/vZcS6i9TkVaixAfxF49SBA+HcZrHdhQg== 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=qKsx43a9ZNmIgLIDPCeMMkwl/6aS9tL98TujUOkCBUA=; b=Z+t9nSw0stwJMOMdPmukvM3toiozqXmrZA9uW+3W0LV0EkQ8mIkQ7HI9DkUXPoV0+3rIei54nzc3Af7vSobYytEE0J3lWM6c5RkBCU8Qc8Qfx0NWChv7oWn8cQLYbA8nmDo+ZkERCNolAjn0/tiKgdrziXtZ4UQj8S+YV+1GB9oDmXOz7evlCByyeq14i2dnb7sAVs1pvEA/vtOZmql68wVzS7hsxYLOIMbio68z3XXW8IaHv6/joQknNdx8ce4ParKKat7WidRr0xj6apXTlWNhqxzFzJCvPpySIIuc//hxNWvhikWoj/Ss3dA/cnacm5qfZRrfiXGYN80DFAc5VQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PA2P250MB1069.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:40d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.31; Wed, 5 Jun 2024 12:25:47 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%4]) with mapi id 15.20.7633.021; Wed, 5 Jun 2024 12:25:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jun 2024 14:25:39 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [XERj23B+di4vAFKiocuYq4rEjLmsoO97MQrKn1Pa/L4=] X-ClientProxiedBy: FR4P281CA0266.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:e8::14) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240605122539.1887503-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PA2P250MB1069:EE_ X-MS-Office365-Filtering-Correlation-Id: 8d74cf9f-8612-4f99-38f7-08dc855aa06d X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: 301wDd4tpD+rkTR72p93GWJzmYpAXODwNNqeBAlYst+Rqrm13pheL7tWBtTV4Bh1XgMvC8D6C+xCdKcKA4s8vkFreSIAOn5/8lZAfu1xjvL5seJvHb09rTr45t3iV30mcgvZL6M2RGp+br/o5NxUIsc2IwFTmSrrurAqdqqShLjIZDO0BfjE//3SjBjVN4ciID6vN44IJQ5QNzBUUBjUKZ1cig7tg4YUwmvsgHYphLHR4Uvro6ncmx70f2Xoi9qI0YMBdih41SbKkeUsST882djchC2o/DPfpPKI0PkF++k+zf4IuZAiRW1Itx6+CVkodwyOMBpyx1cbHyILrDW71DlB6uEo6wGcrHbMACEa5OBeJpNfC0zCmEIQLbTzsfZnEOPcn3VhpPQbwlkNRCzKUbHCCpyJYSc/+UbeCHaCeIBK7LOZpYEJQ70BavUri4usPUPlb6AJvFzgGqr5ZJTQ7W0xYclIysaRTSjx9EMhPHqAxgf+Uk2MatYOI7YO7k+P9zQJUB30o5cVx12BCBPva5E2J1IZwldQKXZcCKG9WQ5NEXP7WNIAomMyWVlSCDDslSOUzD8NKOebqCf7Rz6f+mS74lYji1cFYly92+DimjtDmueLVStmA2Fsdm4Tsc1R X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PEfQ9dmnwyUEA6WgmTwzmb6J6YqJ4DnWX+8Bej7vke2UlqYhOOz1MXX41jDpI0ebeSZhVnCfLzySMxZB/YUW5l2/i/VVBKxV81h9vAx5ZYaKPKTczfOjUI4pbla07Oze7iZHdM2QBzfQDJsD0KYcqCMvi+vFhZbCXO4MrhV6+IijzRn+fo7jdKJMuIFzjtBbmpYq91IKrTGEtT4gO/Q/hVD2T5rfMW9AoRM4Klk0kAMxh4PfecxKBbxTkwntrylyFz34NAu3mZApaJOYDYleZrAoxviapmXNHGLq93dz/mJy8DzhpiJMt/YWJBxFq4Nt9vBf4BY36ugvPoiov9S+/CFXH2sJd4U9TKMYYRzPsi5ax6MnMU+Up8ug6Ww8ZtMzSmJsRXH8QcFqmM0TpFht6RpSZyf6Aostd+zvwNCCHzdiOQjnKajOR0s2m4HEL2v0e8KehYPqrJJoLGxqC6mbIjen/vgHJwgFsvpSkgikc5DpUSYLH0vvP8dsdJAHdo0JOKylfJGJDRL1cQmMgyHh9vstW7XUi6gokofTYCmmCsS7UJZAlxdBzOYzaJzSkEJQ6Lb3arpyqBwICcv24UShQDpoxRTkGHOwQsXRtxKSxTUb6vRJWYCSHRWOXLzCZs1CoTTR2hnXYKkSqZt1WmAjuS5mCnPY7/vOqAphNgsJtMrfD3wTWeAgzhVNj4ssYMZc1FNIsyVFc23lLcnnrwU7sGmXCA932hOnvVfaMGOXTKP31x6ZGxjkXX3ZBxzA71fo9SMlLll59onIakNxrVB1jtsfjogNu916xj1dqFPSQZV0Ly54tys08lTGRgE8Jo7SAJlN5HO8VFzaklYxF1M4ZOFHJ/UKJSlI9CrxMXTK6va3KzFVxzoaEIAvKm2LDFkOggEocV+j0apBR1N1t0jbV8kMCfK/T5vkQ/OR96Tm44lh5zCZ0mtQ/fEkgPyxNlIjwmFge4Ldo88gV9bmERLVvrz9uPuACz6JOGE2tieOl3U1lvI8KFK9jfoXUGdGl63E7dLdT8FDA6rk6cwhVTw4mkOApEAcVY4oJvIaeHJAVrR8j6mVuUSQSSxA4mB0pwp9tUKqfjRs0a5MR5WMueQaMf05fMGcCCcrMUbzVmkCFC8AikGBel6m9P0vly6FAi6p02dTdL7BB7xURQJl4in9kn9gO6VkpLfjgZ8aZWrdB8GUye9tLsvKMoXc3IsmxMwDqvPb/5YqSntSzuanIoF91X5NvToSstIohWvFBWKbfW8XQqsG2t9UDOQsRvsJcyrSGcubTCQWMP3YWe5U2p/wHg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8d74cf9f-8612-4f99-38f7-08dc855aa06d X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2024 12:25:46.6923 (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: PA2P250MB1069 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/dnxhdenc: Simplify padding 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: UiYA7iC2kkry It is unnecessary to first pad to 32bits; the memset later will pad everything will with zeroes anyway. Signed-off-by: Andreas Rheinhardt --- libavcodec/dnxhdenc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 4760a2932c..028604a6e5 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -908,8 +908,6 @@ static int dnxhd_encode_thread(AVCodecContext *avctx, void *arg, dnxhd_encode_block(pb, ctx, block, last_index, n); } } - if (put_bits_count(pb) & 31) - put_bits(pb, 32 - (put_bits_count(pb) & 31), 0); flush_put_bits(pb); memset(put_bits_ptr(pb), 0, put_bytes_left(pb, 0)); return 0;