From patchwork Sat May 25 00:48:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49221 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2069816vqf; Fri, 24 May 2024 17:48:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXKyIMGDBFe6/SqGKdT10HMZSJF1wuCd7ar9+d6sWzFw9v8EeNre+5i7ANdi+Ttx/ZXweuS5tgilkvELwAXxhblO82yYd4LuiGCKw== X-Google-Smtp-Source: AGHT+IHTGevSmMTJjNaIr6nal5YCpitBaeEnIjhg+WGnegOvXYTroW7x/qyNN9YbV6wWBURevOo2 X-Received: by 2002:a50:aa9b:0:b0:578:59f4:9a29 with SMTP id 4fb4d7f45d1cf-57859f49b4bmr1947008a12.23.1716598132114; Fri, 24 May 2024 17:48:52 -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 4fb4d7f45d1cf-5785245fe9fsi1353819a12.212.2024.05.24.17.48.51; Fri, 24 May 2024 17:48:52 -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=KNYdaLUL; 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 A952A68D521; Sat, 25 May 2024 03:48:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2100.outbound.protection.outlook.com [40.92.75.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9339E68D2AC for ; Sat, 25 May 2024 03:48:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D28qnpEPDpmEuuLmKVkrncyxnQL6nIPUupjIn7a1vEYggPbfOmCaWo0ncUuFQK48Yj2mNUL2buerdIeuLVh5Sc9dJ8kaLQc95LfqTmGgZ11XqoazXwDWwpl/6s9ULPK54Gqjc1SOYzJN7s9IQVIZWuh6Lg/aTk3tjHeOxlbikdq6x1sap51i6boiVRA18Eg+e76TcRooYAS3kKzPQVvMT18qUiJ2JEgMZwtarjjHC9E5eHc9B/7UN4RYdOwSXwVfxoJVU5KyhJ+3CoZJ5LHKUuvYvRMgnnKDwB71UPKoW0vAt9Pal5Du8PtGqBD+pJs+FBgx26J2VNnrWgxQZxgz4w== 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=ILWTJwur4lTUQsMR5sqsmUzUK2VaDLY0XClc5FmymWo=; b=jyoybyHWKM/yzGJoGSXE02NZlHioVS2oI9vnKmGPAOffUwEXLXNs9GY/irfGMa9v2IR6SPbMmPUwJtNRqJMSr9Pgyc+CVObgA0z6AQOmH3siQNAMpjovvJpHksAuIzcu+wlzS3yiOoyHpuauYJPJY0vUtuLAGbUn80U8zmYze+O5oo5LUhaCNiBYsq3F5LdLoi86+D/CE6LoX+ikC7DxsKvK/3lj6bplOEkBh8w5hRyjt1MT/QVb0YFvSzoM8Lxqzv5hjpBF88kDb7cZshE0217WyhxIc1vTs5HSyFwwYcVEGD7L2Okb1C0RU1I8oAvlj/4uZLlefpww2D4nz9atng== 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=ILWTJwur4lTUQsMR5sqsmUzUK2VaDLY0XClc5FmymWo=; b=KNYdaLULtjlwgi7TgL6RV8W0vLSjo99X3+YoTnUhlUeJxkwGzCRr0kpCqiOYLBEsaG/sh6NwkLGZyQFAW9DiAdixkGHdvGztA033D1iwlkd6ZuXNJhy6YRx7QK03/mzanCbwuxEjtpaczj9jVCz6QYWGeNAdFBb+KUUZPQowYS/OFiLNaf70eAQcDR4CBbj7VNwjPbBuOiVuOdAm2xSpueJvHMEvOa1z5azVKy1f/sPOf35vQE4eTUcWa/zRq6J2C3GwiAvcyCF2wHXvQpja2ioM/VQ9yyxSV5778EtynuRCesHhkm81hhfk4RT3wnZPUB9JlyVqQ0QpvuxOcqkyuw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU0P250MB0578.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:34e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.27; Sat, 25 May 2024 00:48:38 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.016; Sat, 25 May 2024 00:48:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 May 2024 02:48:27 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [F/zRMRMdcD6IABFthSvfpGOB6hi98xMlshnZU/fKuNY=] X-ClientProxiedBy: ZR0P278CA0168.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::23) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240525004830.1549912-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU0P250MB0578:EE_ X-MS-Office365-Filtering-Correlation-Id: e0bd8194-047f-4f80-14a7-08dc7c546a71 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: VImVaQcpGdTan2y97ksF1zYHvkSUZNl29gAdc7Oa0TraoUzGeJuOTQwq0SFysVDPWx+tXibkk8lgAadF3wwn5xRozFJcs9Vd8PhkeB8Wsx3H5xQbEtecEPF8KYh9kjh8JOqwFW9s8lqQ+r/Y9GCc1dvB7z/yXSu6Mqsi361cGikVRVLbPcLwbQDj49P3WmuVguMhf7SIwJpukpmMtRsuTTXhf1f0z/CytIWUsPMhwBVbAFR7Epbt1TkOON9uSf1HUnYLfH4MZR8dVkliGhdKILTmogw32C4fhv5d7wvtoOzFAfpMHiivbNFagzsv+plGZ7bIaAOL+miP6Do2zVV4jGwKoFgOq9HFDJEDirriVfblUzI++sfH8WcCafI5Cd05xgtC8FhP0zwn0v8rpl+YLBggilkhJx7ml0hRU3iQwi3i+hDzw/M18qfGBcHXFLftjgQmlIrT4X5rrTOP6TdN3phN15fu3BftJyG2R8cAm59a/NDoQWQT6DT04POUQ7D4rgJ0R6bpd3nXThCjOiuzeC7qVdVXBGW5x7v44HtCt+uYbi0puUls8JVdEhfYZjcqNqvTcSLx4X+mlTYlBxT+t7ighsKvYteQS6A685Fu4YLmqP7EqhFE/mrU9a4EwEY7 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lyOssYD1Dhhc53M7+E8dOu7Ae8NAVpvn4SjsJGHCTFjpLKiL8Fz/cweYugoU9v6CHBUiDZ2KIlU+tVyMXThnaRZe1rbFoRKUSjjF7W23vOIEyNP0Q+h/xYjN4D6nqCFC1tvTElSlc1eQ8LrEMIgxeIwMZ6kUWe+DvojJSUewjCTb538E+LgWulHMq1QiUo37IqzhSbkrFJEdYbw/DWXiM9210ha5oqKO9rW3P04ktE/j7gASrdEcYoJvmjVMfLcvLPn4tkE3fBhEAwd2hFPfspEIeXgVa2Z5zCR8aNqa6CQLfsIta2DLvCzd+GeR/mlH4VUu8PfXEFWu/PvZ+UgRnK9IF+hVWPUFCsHc/fZf8AN6HGo1WWg3C4Bh5pJgcEbAfP1hjrBLzzBx1mX1UgnnWhs02wMjPae3UVkVNwQD9GI8HLHGce8VqfQV9sT1Scn0AaGeNLK3NvW02wqtjvUIJ/lGF1CHwoAxfFjYduyo1XSGBgE/IHKtvlkFq08I+MrYkohy1UaYzhqahHSSQBwqLELiImSUZSssgpdEtOYISfIPzWyucK3x1ewkkGdl34/z9BemsweJzPgXzbtdn5bJoG3d9pUjkEqACsk8B93XoPD9aNtqNLggd7lqNHWECGpPW53ptK1WdWHCui9UvagvMM0p1e4x9mCknXVOErfuSJkGSamWANfnFokaVn/Nv2YVgZz6/zRSOpQcOcYIIu5SUaztTLkSrcf6dgrsQ+ZU86PoxfQMMSeNCA25lYchlMCHpcKrtUdl6GbW94LOK/pbIBsKPec617l9hp+fOK1bRba82CxrOhE00zt2iTq3eYb2/lYfs9cUGhjc3mMFeHzI/h/hQa32CqaD0jPsKzFdmQUG+eI4rfC61D1f6/fX62GtjWoNaJHCKoGbeCkD27R2eFc5R1tlOQiWsk5aJ+oA6He8ezDsKCnwSbtz1LnpoX6rqY6l4SX/aMlGbnWcmx/CXdadvZ4fiWC40hE4mdtBEkIljmChSdZBhOPkuLDulWyllsZhKGAv//TFEd8CqGIeDWb7VjiErdrHe1gj5YLrkuZC9WpAzucaHJIEKAdX5ec2GQOwFBITW/JUIVXimANyaGdkyyt2/0U+FmlrVmZ5GpgcppwXbtf93AViHu7f/Ke8nyA8DTjQkQHd8Ggcxl4qaDmK8yLsNEQwrqIsDMSW/Vglt329wn5rBVeCoI9KDrUrxxk0/C5KQ7e/HgY6WTDfufNHu+TlVo13XqWweOvxowkGQ3jj4d2RQVel+ZofXA0VcauRfrCzpUsm1iryDfpcJQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0bd8194-047f-4f80-14a7-08dc7c546a71 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2024 00:48:38.6487 (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: DU0P250MB0578 Subject: [FFmpeg-devel] [PATCH 13/16] avcodec/wmaenc: Move transient PutBitContext from Context 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: 1/zqkTbFdCPq Signed-off-by: Andreas Rheinhardt --- libavcodec/wma.h | 2 -- libavcodec/wmaenc.c | 58 ++++++++++++++++++++++----------------------- 2 files changed, 28 insertions(+), 32 deletions(-) diff --git a/libavcodec/wma.h b/libavcodec/wma.h index 3d0d872ea3..a909f5baa7 100644 --- a/libavcodec/wma.h +++ b/libavcodec/wma.h @@ -28,7 +28,6 @@ #include "avcodec.h" #include "get_bits.h" -#include "put_bits.h" /* size of blocks */ #define BLOCK_MIN_BITS 7 @@ -68,7 +67,6 @@ typedef struct CoefVLCTable { typedef struct WMACodecContext { AVCodecContext *avctx; GetBitContext gb; - PutBitContext pb; int version; ///< 1 = 0x160 (WMAV1), 2 = 0x161 (WMAV2) int use_bit_reservoir; int use_variable_block_len; diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index eaf0498ea2..7240c0895c 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -28,6 +28,7 @@ #include "avcodec.h" #include "codec_internal.h" #include "encode.h" +#include "put_bits.h" #include "wma.h" #include "libavutil/avassert.h" @@ -161,7 +162,7 @@ static void init_exp(WMACodecContext *s, int ch, const int *exp_param) s->max_exponent[ch] = max_scale; } -static void encode_exp_vlc(WMACodecContext *s, int ch, const int *exp_param) +static void encode_exp_vlc(WMACodecContext *s, PutBitContext *pb, int ch, const int *exp_param) { int last_exp; const uint16_t *ptr; @@ -173,7 +174,7 @@ static void encode_exp_vlc(WMACodecContext *s, int ch, const int *exp_param) if (s->version == 1) { last_exp = *exp_param++; av_assert0(last_exp - 10 >= 0 && last_exp - 10 < 32); - put_bits(&s->pb, 5, last_exp - 10); + put_bits(pb, 5, last_exp - 10); q += *ptr++; } else last_exp = 36; @@ -181,7 +182,7 @@ static void encode_exp_vlc(WMACodecContext *s, int ch, const int *exp_param) int exp = *exp_param++; int code = exp - last_exp + 60; av_assert1(code >= 0 && code < 120); - put_bits(&s->pb, ff_aac_scalefactor_bits[code], + put_bits(pb, ff_aac_scalefactor_bits[code], ff_aac_scalefactor_code[code]); /* XXX: use a table */ q += *ptr++; @@ -189,7 +190,8 @@ static void encode_exp_vlc(WMACodecContext *s, int ch, const int *exp_param) } } -static int encode_block(WMACodecContext *s, float (*src_coefs)[BLOCK_MAX_SIZE], +static int encode_block(WMACodecContext *s, PutBitContext *pb, + float (*src_coefs)[BLOCK_MAX_SIZE], int total_gain) { int channels = s->avctx->ch_layout.nb_channels; @@ -230,7 +232,7 @@ static int encode_block(WMACodecContext *s, float (*src_coefs)[BLOCK_MAX_SIZE], } if (channels == 2) - put_bits(&s->pb, 1, !!s->ms_stereo); + put_bits(pb, 1, !!s->ms_stereo); for (ch = 0; ch < channels; ch++) { // FIXME only set channel_coded when needed, instead of always @@ -269,7 +271,7 @@ static int encode_block(WMACodecContext *s, float (*src_coefs)[BLOCK_MAX_SIZE], v = 0; for (ch = 0; ch < channels; ch++) { int a = s->channel_coded[ch]; - put_bits(&s->pb, 1, a); + put_bits(pb, 1, a); v |= a; } @@ -277,8 +279,8 @@ static int encode_block(WMACodecContext *s, float (*src_coefs)[BLOCK_MAX_SIZE], return 1; for (v = total_gain - 1; v >= 127; v -= 127) - put_bits(&s->pb, 7, 127); - put_bits(&s->pb, 7, v); + put_bits(pb, 7, 127); + put_bits(pb, 7, v); coef_nb_bits = ff_wma_total_gain_to_bits(total_gain); @@ -288,7 +290,7 @@ static int encode_block(WMACodecContext *s, float (*src_coefs)[BLOCK_MAX_SIZE], int i, n; n = s->exponent_high_sizes[bsize]; for (i = 0; i < n; i++) { - put_bits(&s->pb, 1, s->high_band_coded[ch][i] = 0); + put_bits(pb, 1, s->high_band_coded[ch][i] = 0); if (0) nb_coefs[ch] -= s->exponent_high_bands[bsize][i]; } @@ -298,13 +300,13 @@ static int encode_block(WMACodecContext *s, float (*src_coefs)[BLOCK_MAX_SIZE], parse_exponents = 1; if (s->block_len_bits != s->frame_len_bits) - put_bits(&s->pb, 1, parse_exponents); + put_bits(pb, 1, parse_exponents); if (parse_exponents) { for (ch = 0; ch < channels; ch++) { if (s->channel_coded[ch]) { if (s->use_exp_vlc) { - encode_exp_vlc(s, ch, fixed_exp); + encode_exp_vlc(s, pb, ch, fixed_exp); } else { av_assert0(0); // FIXME not implemented // encode_exp_lsp(s, ch); @@ -333,28 +335,28 @@ static int encode_block(WMACodecContext *s, float (*src_coefs)[BLOCK_MAX_SIZE], code = run + s->int_table[tindex][abs_level - 1]; av_assert2(code < s->coef_vlcs[tindex]->n); - put_bits(&s->pb, s->coef_vlcs[tindex]->huffbits[code], + put_bits(pb, s->coef_vlcs[tindex]->huffbits[code], s->coef_vlcs[tindex]->huffcodes[code]); if (code == 0) { if (1 << coef_nb_bits <= abs_level) return -1; - put_bits(&s->pb, coef_nb_bits, abs_level); - put_bits(&s->pb, s->frame_len_bits, run); + put_bits(pb, coef_nb_bits, abs_level); + put_bits(pb, s->frame_len_bits, run); } // FIXME the sign is flipped somewhere - put_bits(&s->pb, 1, level < 0); + put_bits(pb, 1, level < 0); run = 0; } else run++; } if (run) - put_bits(&s->pb, s->coef_vlcs[tindex]->huffbits[1], + put_bits(pb, s->coef_vlcs[tindex]->huffbits[1], s->coef_vlcs[tindex]->huffcodes[1]); } if (s->version == 1 && channels >= 2) - align_put_bits(&s->pb); + align_put_bits(pb); } return 0; } @@ -362,23 +364,24 @@ static int encode_block(WMACodecContext *s, float (*src_coefs)[BLOCK_MAX_SIZE], static int encode_frame(WMACodecContext *s, float (*src_coefs)[BLOCK_MAX_SIZE], uint8_t *buf, int buf_size, int total_gain) { - init_put_bits(&s->pb, buf, buf_size); + PutBitContext pb; + init_put_bits(&pb, buf, buf_size); if (s->use_bit_reservoir) av_assert0(0); // FIXME not implemented - else if (encode_block(s, src_coefs, total_gain) < 0) + else if (encode_block(s, &pb, src_coefs, total_gain) < 0) return INT_MAX; - align_put_bits(&s->pb); + flush_put_bits(&pb); - return put_bits_count(&s->pb) / 8 - s->avctx->block_align; + return put_bytes_output(&pb) - s->avctx->block_align; } static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame, int *got_packet_ptr) { WMACodecContext *s = avctx->priv_data; - int i, total_gain, ret, error; + int i, total_gain, ret, error, remaining; s->block_len_bits = s->frame_len_bits; // required by non variable block len s->block_len = 1 << s->block_len_bits; @@ -418,14 +421,9 @@ static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt, avpkt->size = 0; return AVERROR(EINVAL); } - av_assert0((put_bits_count(&s->pb) & 7) == 0); - i = avctx->block_align - put_bytes_count(&s->pb, 0); - av_assert0(i>=0); - while(i--) - put_bits(&s->pb, 8, 'N'); - - flush_put_bits(&s->pb); - av_assert0(put_bytes_output(&s->pb) == avctx->block_align); + remaining = -error; + // Add padding + memset(avpkt->data + avctx->block_align - remaining, 'N', remaining); if (frame->pts != AV_NOPTS_VALUE) avpkt->pts = frame->pts - ff_samples_to_time_base(avctx, avctx->initial_padding);