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 A5E354F7FC for ; Mon, 23 Jun 2025 13:37:41 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 4100368DF25; Mon, 23 Jun 2025 16:37:21 +0300 (EEST) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 6707168DF25 for ; Mon, 23 Jun 2025 16:37:14 +0300 (EEST) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-74801bc6dc5so3276080b3a.1 for ; Mon, 23 Jun 2025 06:37:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750685832; x=1751290632; 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=H7TayQT5d28uCrnyvpF1UkydbcAv2TysOhJer/Lbzvg=; b=IFGObp7qqC0pk0FBsDqXoqZui1P3uOUtY8FjnRlpMf/qL9e/BXeLeV19p7581Xoxiz loCuwhP4Zp71feKxdJb6KSs5KJmtP6fPMw6EMNpy/v8SyYO+BPwNwcqreSkkmp6D9AgW C86iR5RlJkiq50EEXb86Yavz0MxUqhD3/bVWHQrtrrLIzJLQQiMAllVVW7rz+GRW8+D/ qj4YQilmZTiesdnkRyKsaiFyiXSHBPOifupEh5Av6bfMQU5rKFcWCNhL3DBl3+Cwn1K0 mfErh+jmerkRoEfEU5vunMO31XHWP8ynV4mKsb7Coc1tHgjY/2pnSAeWqtAzyG+/e6pP HGDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750685832; x=1751290632; 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=H7TayQT5d28uCrnyvpF1UkydbcAv2TysOhJer/Lbzvg=; b=qmegW3QkYYIEQ2qV/DXI3ptGKNu/KqhPB+xmfUYgdaBhuplwR0Y+kb7b0QjTdWQO5c aadB9/BG4wUY6TGiiU1TUbbmzpfoawkCUly/sZigKe9dX91MS05fsTbTYPQ/KHKw8lVj lhzF4O5w6tf/+LVQuDwl0wMbY1M4m3yH6X1KPl/lFas75J/6FqS3a8hL675hcRyNMoIm UpTRB32Bq0HArLD/00X2avEmn1EPEMcRpPH893gv0JDorZXoi8vxeEQT4EAGqivoS10D dZ6D5b3UYR+Km2LxfGzp3YojKJnH3Y/jIwhq6qgX5iO32DCyIUTbAEFS6zFvcXw2ANDv dmeQ== X-Gm-Message-State: AOJu0YywDkvGKcWyLRXMpeNw/KFjYINn30YCVuUj02h/NfNoSu2RDvbY /PLyhsnBYLHRn9Ov5CN6CvihkrJsg++t0J04fGQPvEIprEaZ2M7mjCvL59cnlQ== X-Gm-Gg: ASbGncuGwO7/HMDA1JuNcDRZHk7ITOqHr+roDH1FguyYK5i1F8uGYTqtM1TzHR4YqY3 fuflEd2ZqM8GqEmvTCdEOlBKUIklHrzRqxDhllkBqwM7I7/ueSVy09dkkF2EQy1s1I+Y3cB+1wN 5VUryxaB6Bk128l3mfAvJKIGsfZmUJ8yGqxMyhT+hzJwmgB7AyWKRKUSUwFTFoKu9KrnPfCxXqt dRRrFX2jAs3+WbjM4J4PdlzfwBzh08jWHujxa7XB6ZOGehRKWr0N7FeEuqLi2iTwuEuyPxwlmlD FDp4YvHgarZygXl56d8qFLdr5+zYVDplzXPuswRqZ+3EFxjxeH3kPjr4IRYEmx/JeFgzPkI3+kn emPy1HT8tCC+bAfS1 X-Google-Smtp-Source: AGHT+IFqSUaDZg2ZWr/V+Tk2HeBBltYlFSBK9i8rUVNPmN0I9LTZYySfIkHDoyHEX7ovhVECAnMf4g== X-Received: by 2002:aa7:9f05:0:b0:742:b928:59cb with SMTP id d2e1a72fcca58-7490f572337mr13169734b3a.7.1750685832386; Mon, 23 Jun 2025 06:37:12 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7490a46b788sm8405882b3a.5.2025.06.23.06.37.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jun 2025 06:37:12 -0700 (PDT) From: Andreas Rheinhardt X-Google-Original-From: Andreas Rheinhardt Message-Id: In-Reply-To: References: Date: Mon, 23 Jun 2025 13:36:03 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 03/48] avcodec/ituh263enc: Simplify creating LUT 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 Only very few combinations (2x102) of 16384 correspond to valid codes; so just initialize all codes via memset and then set the few valid codes explicitly instead of initializing everything in the same way. Signed-off-by: Andreas Rheinhardt --- libavcodec/h263data.h | 4 +++ libavcodec/ituh263enc.c | 54 +++++++++++++++++------------------------ 2 files changed, 26 insertions(+), 32 deletions(-) diff --git a/libavcodec/h263data.h b/libavcodec/h263data.h index 06554bdf0d..e733089e83 100644 --- a/libavcodec/h263data.h +++ b/libavcodec/h263data.h @@ -59,6 +59,10 @@ extern const uint16_t ff_inter_vlc[103][2]; extern const int8_t ff_inter_level[102]; extern const int8_t ff_inter_run[102]; +/* the following defines are valid for both ff_h263_rl_inter and ff_rl_intra_aic */ +#define H263_RL_NB_ELEMS 102 // does not include escape +#define H263_RL_NON_LAST_CODES 58 +#define H263_ESCAPE_CODE_LENGTH 7 extern RLTable ff_h263_rl_inter; extern RLTable ff_rl_intra_aic; diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index 903bb45fce..4ec851cab9 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -99,41 +99,31 @@ static uint8_t uni_h263_inter_rl_len [64*64*2*2]; static av_cold void init_uni_h263_rl_tab(const RLTable *rl, uint8_t *len_tab) { + const uint16_t (*table_vlc)[2] = rl->table_vlc; + const uint8_t *table_run = rl->table_run; + const uint8_t *table_level = rl->table_level; + av_assert0(MAX_LEVEL >= 64); av_assert0(MAX_RUN >= 63); - for (int slevel = -64; slevel < 64; slevel++) { - if (slevel == 0) continue; - for (int run = 0; run < 64; run++) { - for (int last = 0; last <= 1; last++) { - const int index = UNI_MPEG4_ENC_INDEX(last, run, slevel + 64); - int level = slevel < 0 ? -slevel : slevel; - int sign = slevel < 0 ? 1 : 0; - int bits, len, code; - - len_tab[index] = 100; - - /* ESC0 */ - code = get_rl_index(rl, last, run, level); - bits = rl->table_vlc[code][0]; - len = rl->table_vlc[code][1]; - bits = bits * 2 + sign; - len++; - - if (code != rl->n && len < len_tab[index]) - len_tab[index] = len; - - /* ESC */ - bits = rl->table_vlc[rl->n][0]; - len = rl->table_vlc[rl->n][1]; - bits = bits * 2 + last; len++; - bits = bits * 64 + run; len += 6; - bits = bits * 256 + (level & 0xff); len += 8; - - if (len < len_tab[index]) - len_tab[index] = len; - } - } + // Note: The LUT only covers level values for which the escape value + // is eight bits (not 8 + 5 + 6) + memset(len_tab, H263_ESCAPE_CODE_LENGTH + 1 + 6 + 8, + sizeof(uni_h263_intra_aic_rl_len)); + + len_tab += 64; // simplifies addressing + for (int i = 0; i < H263_RL_NB_ELEMS; ++i) { + int run = table_run[i]; + int level = table_level[i]; + int last = i >= H263_RL_NON_LAST_CODES; + int len = table_vlc[i][1]; + + len_tab[UNI_MPEG4_ENC_INDEX(last, run, level)] = + len_tab[UNI_MPEG4_ENC_INDEX(last, run, -level)] = len + 1 /* sign */; + } + for (int run = 0; run < MAX_RUN; ++run) { + len_tab[UNI_MPEG4_ENC_INDEX(0, run, 0)] = + len_tab[UNI_MPEG4_ENC_INDEX(1, run, 0)] = 0; // is this necessary? } } #endif -- 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".