From patchwork Thu Dec 10 11:16:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24508 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 55CDD44AFC6 for ; Thu, 10 Dec 2020 13:25:21 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B67B68A9D9; Thu, 10 Dec 2020 13:19:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D06C668A9C7 for ; Thu, 10 Dec 2020 13:19:25 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id m5so5061878wrx.9 for ; Thu, 10 Dec 2020 03:19:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=TSlNDAQSYi68opEMK37WUpKwL/AfDM3KV+Kkvs2vUk8=; b=kKK8hdMxt+smDsDThmMKZjQ33VotnrW8OPZCVmH6IoUqFppOY8uRLzCjj1XyTMr1ni ibXo84nkgc01YOUvbTlv/01xrykyKJJ2+ic24BDPvwMGjZbxgVm2PVjfyH4wGlN8GHcY C5ZhWb60297XQ9NCtAlFOis3V30TVO2ekIYwAceDuXq7BZORUJXvmH8Huct/eCRkusYA 3VeCyKNoYouAMpi6H+QC72cflmgCELwvyk4wiqUZKqlkKxdaGDAzo8g6r+XX13mudSYv 1SZvY9gFEDwktiATluawGpKGdv8O2pSu2Rz2NXKRGN7SR4LIxwTpUphrkFOqIvTSjAxN ShWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=TSlNDAQSYi68opEMK37WUpKwL/AfDM3KV+Kkvs2vUk8=; b=HCSkqaEvISO2+enP2ZKoWzAiqV2Ed16dg8wPPvITQp0ecJ5TZ2WKDDcaxZGj5KkHxq moiIa09Fazx8ZnN8kWnS0/r1MRAXqHqEyCLZ9sh0dMN8lNzlJ6SPBIULfUxgB6A0hEj+ 6LTug1kXZjOS7BYaW9foGTxovZ0q/qZyPFvJF1/ftawz6GyPLKO20fIxUC8ErOKRN1tU oihZ+q+obdtYFSwIkdvJbk07IDieIqUAc78DMOxGd+U2507rhpo3lc9TuXD1GLLJMoVd 9GiMr/xk0IiPFviEJzx5WSnlXLc2wtD/Ug96/UBHXBEjQsUT97nznCe0S7ER3fgX2U/v E64g== X-Gm-Message-State: AOAM530BQLaH70aGjW15cIeS2eBGaEdtHA1I/dyX7jNRl21vPKl2jEl7 zm6G9aS036ZvM+yGfzjygfEGrHTJWmel4w== X-Google-Smtp-Source: ABdhPJwsxyBCYWfuC1/oBpC2k1MsoglVT+G1lUuu8cqj9hC2Gygih8YaKJu1IO48i3UGxLQdRBjP7Q== X-Received: by 2002:adf:e541:: with SMTP id z1mr7620127wrm.143.1607599165109; Thu, 10 Dec 2020 03:19:25 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id s133sm8942330wmf.38.2020.12.10.03.19.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Dec 2020 03:19:24 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Dec 2020 12:16:56 +0100 Message-Id: <20201210111657.2276739-39-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201210111657.2276739-1-andreas.rheinhardt@gmail.com> References: <20201210111657.2276739-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 38/39] avcodec/speedhqenc: Hardcode table to save space X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" The SpeedHQ encoder currently reverses the entries of two small tables and stores them in other tables. These other tables have a size of 48 bytes, yet the code for their initialization takes 135 bytes (GCC 9.3, x64, O3 albeit in an av_cold function). So remove the runtime initialization and hardcode the tables. Signed-off-by: Andreas Rheinhardt --- libavcodec/speedhqenc.c | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/libavcodec/speedhqenc.c b/libavcodec/speedhqenc.c index dbc638cb82..abad87632f 100644 --- a/libavcodec/speedhqenc.c +++ b/libavcodec/speedhqenc.c @@ -38,8 +38,13 @@ extern RLTable ff_rl_speedhq; static uint8_t speedhq_static_rl_table_store[2][2*MAX_RUN + MAX_LEVEL + 3]; -static uint16_t mpeg12_vlc_dc_lum_code_reversed[12]; -static uint16_t mpeg12_vlc_dc_chroma_code_reversed[12]; +/* Exactly the same as MPEG-2, except little-endian. */ +static const uint16_t mpeg12_vlc_dc_lum_code_reversed[12] = { + 0x1, 0x0, 0x2, 0x5, 0x3, 0x7, 0xF, 0x1F, 0x3F, 0x7F, 0xFF, 0x1FF +}; +static const uint16_t mpeg12_vlc_dc_chroma_code_reversed[12] = { + 0x0, 0x2, 0x1, 0x3, 0x7, 0xF, 0x1F, 0x3F, 0x7F, 0xFF, 0x1FF, 0x3FF +}; /* simple include everything table for dc, first byte is bits * number next 3 are code */ @@ -48,30 +53,8 @@ static uint32_t speedhq_chr_dc_uni[512]; static uint8_t uni_speedhq_ac_vlc_len[64 * 64 * 2]; -static uint32_t reverse(uint32_t num, int bits) -{ - return bitswap_32(num) >> (32 - bits); -} - -static void reverse_code(const uint16_t *code, const uint8_t *bits, - uint16_t *reversed_code, int num_entries) -{ - for (int i = 0; i < num_entries; i++) - reversed_code[i] = reverse(code[i], bits[i]); -} - static av_cold void speedhq_init_static_data(void) { - /* Exactly the same as MPEG-2, except little-endian. */ - reverse_code(ff_mpeg12_vlc_dc_lum_code, - ff_mpeg12_vlc_dc_lum_bits, - mpeg12_vlc_dc_lum_code_reversed, - 12); - reverse_code(ff_mpeg12_vlc_dc_chroma_code, - ff_mpeg12_vlc_dc_chroma_bits, - mpeg12_vlc_dc_chroma_code_reversed, - 12); - ff_rl_init(&ff_rl_speedhq, speedhq_static_rl_table_store); /* build unified dc encoding tables */