From patchwork Tue Nov 10 10:47:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23466 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 BBE97449B06 for ; Tue, 10 Nov 2020 12:49:27 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A349668BD91; Tue, 10 Nov 2020 12:49:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD58D68BD80 for ; Tue, 10 Nov 2020 12:49:25 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id j7so4888244wrp.3 for ; Tue, 10 Nov 2020 02:49: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=HOtGGl8mX34eGqfZi23QVrKjyFSwhg3yECk8ssX2N5E=; b=tS+HRwk4ILZ3AafwById2lPGWt/1Qgl84uMd44oHreZGx4KYGdPqOhaAyzxPHIMHxg asM0kFY1NQXEsl9oH3TZKpEtAgiBJbuM6U9vYFZOQcd8/WJ9vNZ4LuvAZOVEqnIDvRpG +1yT9ZKBUhnYK93iqwEzecyFgbEkUxyOPFvMBmymGYxYXyvubSr9Yvjap4pYl1CqXJxf FCL2t1sy7RvJvG5BKxWPXoyUDmcJARXGEl9V4wuElwzTRJ491EizNHXwq3eyhdfazQE/ kppCP1/RR+CZhep9VPTov/T6TIOBfFD30+Ck2IkXII6baiEW5v+2kH9N6pj+PBErjS1h Pt+g== 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=HOtGGl8mX34eGqfZi23QVrKjyFSwhg3yECk8ssX2N5E=; b=N3IKcgoyGyQ2UdnURIVk7K/Woel1mIFWYzAhEKCnJtNMKi7YUu1OSjcCu21kc1Tly9 qcb7XkR8D2/Ffu/JyfJztUGgsiNrvA29OtU/TYlffOYW0C5VU1E6fX6aq7jmVubujYCg kjVtEUsVhb4qMUlhb1KEKEq9XPt7m62OhESjSyQR5E7Uf5g5HunkTyPfejeJzw5p/IWo 8e/P9x78FFYZOBiTjcgtbWuUQEJR4JXH9uDYQEPZvKG69P/8QxNov1xFgmzcAc5Vu8JG IYRZh4bgfiK/BlsUgjgVaFiCTLv/AE/c4kMGy7W2gqmTvj4b4IfuWfaWE4P2L3gI+mAA 8oEA== X-Gm-Message-State: AOAM530adP53rzu+0qob/klKjQlyYXo2KPBIicx6J1yITc+pSWP+jN/w HBP7HqeFrKx/BAbaM39RFjl3Ayw9/eI= X-Google-Smtp-Source: ABdhPJyH0+wr1BnMhr1N1yM19TASSGgMXJ6GDL1GDHIjf0aDiUQ5DaRzuAsmieD7K2LKO12/ye6RPA== X-Received: by 2002:adf:e3cf:: with SMTP id k15mr7067759wrm.259.1605005364735; Tue, 10 Nov 2020 02:49:24 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id l24sm2572543wmi.7.2020.11.10.02.49.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 02:49:24 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Nov 2020 11:47:03 +0100 Message-Id: <20201110104851.321029-7-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201110104851.321029-1-andreas.rheinhardt@gmail.com> References: <20201110104851.321029-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 006/114] avcodec/cllc: Improve creating VLCs 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" One can offload the computation of the codes to ff_init_vlc_from_lengths(); this also improves performance: The number of decicycles for one call to read_code_table() decreased from 198343 to 148338 with the sample sample-cllc-rgb.avi from the FATE suite; it has been looped 100 times and the test repeated ten times to test it sufficiently often. Signed-off-by: Andreas Rheinhardt --- libavcodec/cllc.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/libavcodec/cllc.c b/libavcodec/cllc.c index 8b1bc75faa..24821f8c16 100644 --- a/libavcodec/cllc.c +++ b/libavcodec/cllc.c @@ -46,11 +46,9 @@ static int read_code_table(CLLCContext *ctx, GetBitContext *gb, VLC *vlc) { uint8_t symbols[256]; uint8_t bits[256]; - uint16_t codes[256]; - int num_lens, num_codes, num_codes_sum, prefix; + int num_lens, num_codes, num_codes_sum; int i, j, count; - prefix = 0; count = 0; num_codes_sum = 0; @@ -74,19 +72,13 @@ static int read_code_table(CLLCContext *ctx, GetBitContext *gb, VLC *vlc) for (j = 0; j < num_codes; j++) { symbols[count] = get_bits(gb, 8); bits[count] = i + 1; - codes[count] = prefix++; count++; } - if (prefix > (65535 - 256)/2) { - return AVERROR_INVALIDDATA; - } - - prefix <<= 1; } - return ff_init_vlc_sparse(vlc, VLC_BITS, count, bits, 1, 1, - codes, 2, 2, symbols, 1, 1, 0); + return ff_init_vlc_from_lengths(vlc, VLC_BITS, count, bits, 1, + symbols, 1, 1, 0, 0); } /*