From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 61C224F1C3 for ; Sun, 15 Jun 2025 17:00:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 573F068D8F0; Sun, 15 Jun 2025 19:57:40 +0300 (EEST) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id E32F568BFD1 for ; Sun, 15 Jun 2025 19:57:38 +0300 (EEST) Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-b2f11866376so2824441a12.3 for ; Sun, 15 Jun 2025 09:57:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750006656; x=1750611456; darn=ffmpeg.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc:subject:date :message-id:reply-to; bh=8xUHmHfme4StkvycXavfJJA181o31HAon2M2ksCyrLI=; b=HW7oe2Cjp4xa843ecuBYrajPjqL9Ib5iF5bv8Kf+QBEo7AntIdisduKFeWkYEn1qe9 GQAnxrUPel0Z8tTId33PsCUNFraIWi1W7Ami++AwvTFh5vYIPoWLfIsO9b3O0ek703I/ dqpZzZsn2/ra7qfkqfIALfXmBP3cTDfwL/heNmD1cyX9mRUnb8oo/FkiJXxC93NegILR 6XG4r+gQFLT/j7darH/vyadZFjeerY02oaXGPnQdmjfOt1Wcz0ryJ/4qPVDLeKrNOckz znSK8weRkULXupxs76YdHLCEj6cRuF0cig9hUgDh0EjAYJTX4JKY3zkdd/xVttqB863q givg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750006656; x=1750611456; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=8xUHmHfme4StkvycXavfJJA181o31HAon2M2ksCyrLI=; b=Lx5RCGoGfsl1g2MRw1UMUPOdW7iGtm7ioc7iDQDTpJVdRNz+UutfMn05IGl4WCXPE6 cJTUmZ9nfHFn0SSPXubbPmGplU5iBN/lku/r3l4x7rtyLzMY5r8F76BXeS+ohj5p6Y4T HXxAYo8PSbs7atspn644ZPd4lMWSO8/ffR0rIPJPP7CGZS0+16X0y93n4ViN+rNkaGBr PlVAn86dzsF2+i5ioDDO0wRNOMT6F9AiNmmAVUHfFTYcxewdy/mki2QFGerIHNwGIb4R fXzSGrr7iMlvWPbseEnrzCor6/EXHlQjnZDVS0yDJkz9rJD1dXLYDlVI7dMUZzW6XX0I Zeyw== X-Gm-Message-State: AOJu0Yyspr4rMZG9tMysIeq7/Y+L+41mtgNAOYWQ5iMMTK8YQV7Y1jKC TrZKb1I/XKrHNmOzj9R7WP60mbeyzaAg2nzYilrfJGnJU/VLNlWuyg3U8OeHag== X-Gm-Gg: ASbGncsb6wd3Inm+cXQwHFWPcL/h0VzQbkSDmgX91j+baIGpoSa/04Pkms4gEmUgkGj 0zm02tDprk+5KezKCg7p5r7LPTWY+SLmqeFkKdefIx0m2hf/JSmcVCqHgUFWHiVjHYFOeFpBjlY 0D2nbNiBaKgDBhm4vvhqZDG7UBcc51FdDjFvP5JC0btdOLdO/3tHBUOtOox/ryMXkLrusN7GnOK bmJlhxmTUFWQRpDephvXzroXw5u26pJhQgCveqM7f0hs1KVyBFuDzcFc+JPtVmiTSrMEPZUcuJd O54aFis8sU1x+pSIh1p+luTBrVZPpiw1Ydus8jKYlvatvpmLxdBirNb8UWCHY6fQrCYUZ7CEKT8 oAJS7QMtCPXagmNvY X-Google-Smtp-Source: AGHT+IFJPD8XGDb8jpRGhj+exV6SQEdNLPqpFqdKYJTl23msXecL2r1mILy2Cz3Wp6OhDP0yygAuLg== X-Received: by 2002:a05:6a21:b90:b0:21f:a883:d1dd with SMTP id adf61e73a8af0-21fbd4ddac8mr9997443637.14.1750006656454; Sun, 15 Jun 2025 09:57:36 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74890083ba7sm5265214b3a.102.2025.06.15.09.57.35 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Jun 2025 09:57:36 -0700 (PDT) From: Andreas Rheinhardt X-Google-Original-From: Andreas Rheinhardt Message-Id: In-Reply-To: References: Date: Sun, 15 Jun 2025 16:54:21 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 30/47] avcodec/flvenc: Move ff_flv2_encode_ac_esc() to ituh263enc.c 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: From: Andreas Rheinhardt This is the only place where it is used. Signed-off-by: Andreas Rheinhardt --- libavcodec/flvenc.c | 22 ---------------------- libavcodec/flvenc.h | 4 ---- libavcodec/ituh263enc.c | 24 +++++++++++++++++++++++- 3 files changed, 23 insertions(+), 27 deletions(-) diff --git a/libavcodec/flvenc.c b/libavcodec/flvenc.c index 184e688ebd..4143e7eecf 100644 --- a/libavcodec/flvenc.c +++ b/libavcodec/flvenc.c @@ -67,28 +67,6 @@ int ff_flv_encode_picture_header(MPVMainEncContext *const m) return 0; } -void ff_flv2_encode_ac_esc(PutBitContext *pb, int slevel, int level, - int run, int last) -{ - unsigned code; - int bits; - if (level < 64) { // 7-bit level - bits = 1 + 1 + 6 + 7; - code = (0 << (1 + 6 + 7)) | - (last << (6 + 7)) | - (run << 7) | - (slevel & 0x7f); - } else { - /* 11-bit level */ - bits = 1 + 1 + 6 + 11; - code = (1 << (1 + 6 + 11)) | - (last << (6 + 11)) | - (run << 11) | - (slevel & 0x7ff); - } - put_bits(pb, bits, code); -} - const FFCodec ff_flv_encoder = { .p.name = "flv", CODEC_LONG_NAME("FLV / Sorenson Spark / Sorenson H.263 (Flash Video)"), diff --git a/libavcodec/flvenc.h b/libavcodec/flvenc.h index 3dc7480376..a244145e42 100644 --- a/libavcodec/flvenc.h +++ b/libavcodec/flvenc.h @@ -21,12 +21,8 @@ #ifndef AVCODEC_FLVENC_H #define AVCODEC_FLVENC_H -#include "put_bits.h" - typedef struct MPVMainEncContext MPVMainEncContext; int ff_flv_encode_picture_header(MPVMainEncContext *const m); -void ff_flv2_encode_ac_esc(PutBitContext *pb, int slevel, int level, int run, - int last); #endif /* AVCODEC_FLV_H */ diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index 8126bf5c84..35d6aea9b5 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -417,6 +417,28 @@ void ff_clean_h263_qscales(MPVEncContext *const s) static const int dquant_code[5]= {1,0,9,2,3}; +static void flv2_encode_ac_esc(PutBitContext *pb, int slevel, int level, + int run, int last) +{ + unsigned code; + int bits; + if (level < 64) { // 7-bit level + bits = 1 + 1 + 6 + 7; + code = (0 << (1 + 6 + 7)) | + (last << (6 + 7)) | + (run << 7) | + (slevel & 0x7f); + } else { + /* 11-bit level */ + bits = 1 + 1 + 6 + 11; + code = (1 << (1 + 6 + 11)) | + (last << (6 + 11)) | + (run << 11) | + (slevel & 0x7ff); + } + put_bits(pb, bits, code); +} + /** * Encode an 8x8 block. * @param block the 8x8 block @@ -522,7 +544,7 @@ static void h263_encode_block(MPVEncContext *const s, int16_t block[], int n) put_sbits(&s->pb, 6, slevel>>5); } } else { - ff_flv2_encode_ac_esc(&s->pb, slevel, level, run, last); + flv2_encode_ac_esc(&s->pb, slevel, level, run, last); } } else { put_bits(&s->pb, 1, sign); -- ffmpeg-codebot _______________________________________________ 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".