From patchwork Thu Feb 18 03:41:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25758 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:6d42:0:0:0:0:0 with SMTP id i63csp2517880ybc; Wed, 17 Feb 2021 19:44:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJzKfxjYRu5GYf74dU2JudsmakeaAQTpvgx2r7LGwDKZYPf9wDxxkyNn4qt7GBP5iooljx5w X-Received: by 2002:a17:906:28d6:: with SMTP id p22mr1995723ejd.365.1613619863797; Wed, 17 Feb 2021 19:44:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613619863; cv=none; d=google.com; s=arc-20160816; b=mmvy859T2R8i7AqcFIqg6RU5Qi8zEv5MIHJMYFQAWI4JHS+qx/s/0Nxl/ZFBxnSCYE s685O1E9kT+uAw5WDNBjaBT/xLuNzOKcqwXgVGvZ1MuotBnyTIU5UGWlDNvZiUZLbBxg VrjGrxfJqVKJpnYXZGXMUEI7d8ebX8K4C1PYDZSpusFRmqZa1y5PZ1DF625/A4HhGNp0 Dhk3rmhpv0FW8lKRTHNl6rWRrwW/CNNzZYjJe3L/CJUcy4kITw1iFZJNEp/Np26Sj1D4 LUMpe7sCiO6mRrO97Am4BCU1Y8k2m9ScU7RBXqJ6SWdKAuol+bRtcndsZJqbQnpBLmnp 6Csg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=OCvO4xFVjEwWM/D2ZrTF2vXgv/WY6pA9LKVY4crBTjM=; b=pDqTv3aJ9yKRyUFgOp3Oilf44pFCLe73Tm+gRueXI4kQBbpCoK1YYLA/CtlmolUWiO S06xXA5IZcKgPUhwwwteCHoZ1o0ekDyCQLRM77m/jImj3TaPbRSJ6TEp3LOYMxAMUpGb 2zqsj8dKh0lU20BZsiRyBq9vbCf2hHyqcJNdfD7f5mCJWoH3A7pbVD/wgpk6AFGiebtK C5y1Y7MaJW0m9oywWqDHNBFKe0kIM8h5qc5ACdfD4wB5+FW+RAre+4VpgQFLB/nLJLN5 Fd1NrjbyBGkvcYz0Z7YFXRw/Y8jiJiY15hvp77lh3gJujh0N/v2O/QzhoHyuYtRSy5SG r2rQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=c6MEoxRt; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bi3si2850283ejb.623.2021.02.17.19.44.23; Wed, 17 Feb 2021 19:44:23 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=c6MEoxRt; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D901E68A32C; Thu, 18 Feb 2021 05:43:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 598B86881BD for ; Thu, 18 Feb 2021 05:42:49 +0200 (EET) Received: by mail-wr1-f41.google.com with SMTP id b3so1161307wrj.5 for ; Wed, 17 Feb 2021 19:42:49 -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=bqMiSdKpwd3hVzuf7sihUsFDxXaeQcoS6qcISoN8wvc=; b=c6MEoxRtx1DYxsi5XssMhpilA0mxy/Vi6buI6gQjW5RA+eLHdX9/Gp+/5JbdYMjZF4 T/6a9828LjHjTdvnE4mwuX1CDpLRcOYwo27EZiJdNy3jU61pnw5oScy4lMO5oFEgcA74 4hc8yalv9Ei7Z3MiCKkZo6VGv81D9NWzreATZJEuYN2AB1eqZApXqqyu8hnymJGAtJFl OAtLo8aurHn8VTj81XQFRkoaZ1JpuDE+TlKjvZ3bhV3gE53Z6w8BSZqH/o733liokfgd PCKqSJe53jJvns6Ba6ftRACV8db0NC1IO9nbhtEPMZcamRdFxbs8RRI1ai5NGg6irTj7 oavA== 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=bqMiSdKpwd3hVzuf7sihUsFDxXaeQcoS6qcISoN8wvc=; b=fm6GUY6KwMajie0vFdq9AWEl4T1A5+5VwFsU6bl4XL2i4BJeFrwU1yNdq9WhkE+e6e 91rBXkHbH+PHgR/aU4YwiidK9zlWq7wMG8NpgarkLu/JoeLj1+pmlb2Ag/2WWSUZRdph O5fWQRUGPycEk4DWZJOJsNqHEZzv9csm0aM+dE/SWDq4u3MZ8PuK2R0IpEVoejrOavuN 5ilEHDhJnlRI9M3aFVajc0fJDKRGvauu5jCKRETIj1z29voTWa1avJhZfuqkNLAWtciQ msjZw+5OBXnFCRcGtXVg208ExuJclRSNqtWa1SVj9ugs8JvkfCO698JE+nk0GuWtb1iA 0NNA== X-Gm-Message-State: AOAM531wZwYzqXjDiJOGjA77GExVsjjZeLFYOQ8YkRQgj9I8QJth0L1e WT0JPR0T9RO756vli12xPcRayl1ZtP8= X-Received: by 2002:adf:dcd0:: with SMTP id x16mr2149045wrm.13.1613619768701; Wed, 17 Feb 2021 19:42:48 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id p9sm5643855wmc.1.2021.02.17.19.42.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 19:42:48 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Feb 2021 04:41:52 +0100 Message-Id: <20210218034214.2090223-7-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210218034214.2090223-1-andreas.rheinhardt@gmail.com> References: <20210218034214.2090223-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/29] avcodec/jpegtables: Move ff_mjpeg_build_huffman_codes to mjpegenc_common 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" X-TUID: iMIPfLTJS98u Content-Length: 5301 Since g2meet.c doesn't use it any more, only encoders use it and the place for their common code is mjpegenc_common.c. Signed-off-by: Andreas Rheinhardt --- libavcodec/jpegtables.c | 21 --------------------- libavcodec/jpegtables.h | 4 ---- libavcodec/mjpegenc_common.c | 21 +++++++++++++++++++++ libavcodec/mjpegenc_common.h | 3 +++ 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/libavcodec/jpegtables.c b/libavcodec/jpegtables.c index e44bc7a22a..ef3f8dee20 100644 --- a/libavcodec/jpegtables.c +++ b/libavcodec/jpegtables.c @@ -122,24 +122,3 @@ const uint8_t avpriv_mjpeg_val_ac_chrominance[] = 0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa }; - -/* isn't this function nicer than the one in the libjpeg ? */ -void ff_mjpeg_build_huffman_codes(uint8_t *huff_size, uint16_t *huff_code, - const uint8_t *bits_table, - const uint8_t *val_table) -{ - int i, j, k,nb, code, sym; - - k = 0; - code = 0; - for(i=1;i<=16;i++) { - nb = bits_table[i]; - for(j=0;j