From patchwork Tue Nov 10 10:47:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23507 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 BE6C6449A48 for ; Tue, 10 Nov 2020 12:57:41 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C829B68BE84; Tue, 10 Nov 2020 12:50:09 +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 857AF68BD43 for ; Tue, 10 Nov 2020 12:49:56 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id j7so4889949wrp.3 for ; Tue, 10 Nov 2020 02:49:56 -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=UeqgSPKZskcNQGrngNAXnbSNdEWUtcJxlHQ9bDFmTLI=; b=p7pTDEakt5VbrJqSaR1V34Vy7u+IPSCsvsMQgyRRX8YMYUUihkVSGL00TobAYQDwIt uLMlOL2PbnKlgJwTnlJermhP4H/Oy6kxB1JF4BIF2jwPTX28xOO2wgE7jo2JDzqRYyt/ UCBgNjz/h66YG1839FprxLtl1M5hQGts4QFvV73CFXhxM8jJBnXCnDtznSjofJyqcfah 7UF0bhE15KAB5wwUmAiiOxIyAjedq5K4voVDAGnsUYxjSTAqLyF/Ga7LxZxZKEQ0g5S6 7jWELA2rFiQuKhrzyPyB+KYMTlB0CLYdqe1sW9qCv2ORxoLxAKStIdIvWchvgepyTVeL MqRQ== 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=UeqgSPKZskcNQGrngNAXnbSNdEWUtcJxlHQ9bDFmTLI=; b=jO2ryc04O86EcjZtYr/1h/e3N/ksz01bNN6OAVMGC9RhvQak1I7LbCUW+qYpncAF1w mf0CdCPzRqU1Hy5YrYkTjsQxHLIQ1H9OUBPN8yF+fZvPA0KDfzev9hW3uTb+saHzj/mP HpiRiNShsLkanTrKl0Q/KwunIEXo91iC0INcppNOrOXAPsj4VVEpkdGocDCQjcurXv1m qMcD8vk0nY8oz6feddzKtmaDf6ak2HDF5zYa3l/vaDEja6IAP9DUD9zxNZZCc8/GRoHi MfD8w5KXc029ztSseuH81os0RfV+6y076QrbDotAjxu00snBEVfMNKhK1HNNO8U5Ta0F 68UQ== X-Gm-Message-State: AOAM531I/5KOdeFMnsE3VKSYTcy0KQmI4aewGqDpUvSgOUlo0GtlwSQN f42/X93urT6fbZMNhV1jQ3fm0adG3vc= X-Google-Smtp-Source: ABdhPJxE0QSMg9dyNoS7pQ3Kfo6kwRhZvJnWUaZurh2whDYEdM7Oq1MBzV88msLfyLg+ym7CG0QRjQ== X-Received: by 2002:adf:dc0a:: with SMTP id t10mr23259271wri.314.1605005395778; Tue, 10 Nov 2020 02:49:55 -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.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 02:49:55 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Nov 2020 11:47:33 +0100 Message-Id: <20201110104851.321029-37-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 036/114] avcodec/motionpixels: Use symbols table 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" If allows us to directly store the deltas in the VLC table and therefore avoids a level of indirection. Signed-off-by: Andreas Rheinhardt --- libavcodec/motionpixels.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/libavcodec/motionpixels.c b/libavcodec/motionpixels.c index a65250efe5..927f9fdc14 100644 --- a/libavcodec/motionpixels.c +++ b/libavcodec/motionpixels.c @@ -192,10 +192,8 @@ static void mp_set_rgb_from_yuv(MotionPixelsContext *mp, int x, int y, const Yuv static av_always_inline int mp_get_vlc(MotionPixelsContext *mp, GetBitContext *gb) { - int i; - - i = (mp->codes_count == 1) ? 0 : get_vlc2(gb, mp->vlc.table, mp->max_codes_bits, 1); - return mp->codes[i].delta; + return mp->vlc.table ? get_vlc2(gb, mp->vlc.table, mp->max_codes_bits, 1) + : mp->codes[0].delta; } static void mp_decode_line(MotionPixelsContext *mp, GetBitContext *gb, int y) @@ -322,9 +320,14 @@ static int mp_decode_frame(AVCodecContext *avctx, if (sz == 0) goto end; - if (mp->codes_count > 1) - if (init_vlc(&mp->vlc, mp->max_codes_bits, mp->codes_count, &mp->codes[0].size, sizeof(HuffCode), 1, &mp->codes[0].code, sizeof(HuffCode), 4, 0)) - goto end; + if (mp->codes_count > 1) { + ret = ff_init_vlc_sparse(&mp->vlc, mp->max_codes_bits, mp->codes_count, + &mp->codes[0].size, sizeof(HuffCode), 1, + &mp->codes[0].code, sizeof(HuffCode), 4, + &mp->codes[0].delta, sizeof(HuffCode), 1, 0); + if (ret < 0) + goto end; + } mp_decode_frame_helper(mp, &gb); ff_free_vlc(&mp->vlc);