From patchwork Mon Jul 13 11:16:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Baptiste Kempf X-Patchwork-Id: 20987 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 56AEE44B1FE for ; Mon, 13 Jul 2020 14:16:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1B8F1687FE4; Mon, 13 Jul 2020 14:16:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4ED1D687FE4 for ; Mon, 13 Jul 2020 14:16:24 +0300 (EEST) Received: by mail-wr1-f50.google.com with SMTP id f2so15893653wrp.7 for ; Mon, 13 Jul 2020 04:16:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MmiNp1S5pph9BmEFMhQ6D5oKzIbycVxpTGY/cDbG/qY=; b=uxAnjSklr/fa2Y5bX3qovn+6QL0XD1hp+tbWub8CIvuipy1mfSKT2sY8iyH9EtjdWl xL3wTPxrL/Pfie/mP09umajo4tZSumLlpylPkXKMdz1SmEkDQbsWtnAmO/6aSSDKvlYr x0UV8TAnO/rcQJ/+HRkNXAjMY60zJH1y9obmRcf+InR4jSN6Ou7o6jTO8FlLfPm/w05F 8LqSZfCz6aMBCFZejz9nhgEMnDxr+uNSBy1SWPJCtgBsITnSZumfuDPHe7fr3CwlayGy yMGC4enpNc02dcsCnLFZtmNbABSyiFsTyhW71uOiHpuUlbscIVaHkSZNeqj/o6EXXW1b NpEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=MmiNp1S5pph9BmEFMhQ6D5oKzIbycVxpTGY/cDbG/qY=; b=FGYl0nVvLcu22WQbffPDVFNsIblzVFj3WrAQxXskFzIhdPx1EYYXX/CE5EK2GU3wxb evf8qRk9bOGH70mM3QZvOVjRCUilNEt1NsbiuF4EIbqtmN0Xx9oLNmPtuwYOAjIYla8I MEHM2ELSkbYQhaQn4qY4C13pv7y7XxyVkO1EuHIlluI9A51JUqMwjj0jO48Yak65JXY9 TbotQ+QYJyZj8Q0D81DQ6JOqCPrEDKlNkvUFsu21D6nglgj/xLTet+fqqFR2X4/awunq 0XsIIaLwQmZ7plRFm9TlR4nrZNLeG0qsaMdAMNZUbWDfGsFo+DmNecPKAB9Q7wm7FPNB EDJA== X-Gm-Message-State: AOAM531n1JNNqznATgdb+go+MEafc9kDJiklnq0xZxBEWhOwmWczXc4C 2EtprX0EBgKnUy51ga3tORtf9S1Rxck= X-Google-Smtp-Source: ABdhPJzmpYDbBSQ0yfzOUS25jT1jItuQF5pxEbP1kL5JYhCzIROR1FylC5eV60crzx6iIOdssFvuGw== X-Received: by 2002:adf:f707:: with SMTP id r7mr78104909wrp.70.1594638982809; Mon, 13 Jul 2020 04:16:22 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:14f:f4d0:d145:7cad:1f3d:8c6b]) by smtp.gmail.com with ESMTPSA id t16sm24444526wru.9.2020.07.13.04.16.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 04:16:22 -0700 (PDT) From: Jean-Baptiste Kempf To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Jul 2020 13:16:18 +0200 Message-Id: <20200713111619.226490-1-jb@videolan.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] mpeg2: Renaming functions around init_uni_ac_vlc 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: Jean-Baptiste Kempf Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" We need to export init_uni_ac_vlc to init_uni_ac_vlc and therefore need renaming ff_init_uni_ac_vlc to ff_init_uni_ac_huffman for the following patch. --- libavcodec/mjpegenc.c | 4 ++-- libavcodec/mjpegenc_common.c | 6 +++--- libavcodec/mjpegenc_common.h | 2 +- libavcodec/mpeg12.h | 2 ++ libavcodec/mpeg12enc.c | 6 +++--- libavcodec/speedhq.c | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 56ccbc5fb1..eaa739306a 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -106,8 +106,8 @@ av_cold int ff_mjpeg_encode_init(MpegEncContext *s) avpriv_mjpeg_bits_ac_chrominance, avpriv_mjpeg_val_ac_chrominance); - ff_init_uni_ac_vlc(m->huff_size_ac_luminance, m->uni_ac_vlc_len); - ff_init_uni_ac_vlc(m->huff_size_ac_chrominance, m->uni_chroma_ac_vlc_len); + ff_init_uni_ac_huffman(m->huff_size_ac_luminance, m->uni_ac_vlc_len); + ff_init_uni_ac_huffman(m->huff_size_ac_chrominance, m->uni_chroma_ac_vlc_len); s->intra_ac_vlc_length = s->intra_ac_vlc_last_length = m->uni_ac_vlc_len; s->intra_chroma_ac_vlc_length = diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c index 3038ebde6e..fed32efc67 100644 --- a/libavcodec/mjpegenc_common.c +++ b/libavcodec/mjpegenc_common.c @@ -36,7 +36,7 @@ #include "mjpegenc_huffman.h" #include "mjpeg.h" -av_cold void ff_init_uni_ac_vlc(const uint8_t huff_size_ac[256], uint8_t *uni_ac_vlc_len) +av_cold void ff_init_uni_ac_huffman(const uint8_t huff_size_ac[256], uint8_t *uni_ac_vlc_len) { int i; @@ -551,8 +551,8 @@ int ff_mjpeg_encode_stuffing(MpegEncContext *s) // Replace the VLCs with the optimal ones. // The default ones may be used for trellis during quantization. - ff_init_uni_ac_vlc(m->huff_size_ac_luminance, m->uni_ac_vlc_len); - ff_init_uni_ac_vlc(m->huff_size_ac_chrominance, m->uni_chroma_ac_vlc_len); + ff_init_uni_ac_huffman(m->huff_size_ac_luminance, m->uni_ac_vlc_len); + ff_init_uni_ac_huffman(m->huff_size_ac_chrominance, m->uni_chroma_ac_vlc_len); s->intra_ac_vlc_length = s->intra_ac_vlc_last_length = m->uni_ac_vlc_len; s->intra_chroma_ac_vlc_length = diff --git a/libavcodec/mjpegenc_common.h b/libavcodec/mjpegenc_common.h index e8698d18c6..c24fee0b4e 100644 --- a/libavcodec/mjpegenc_common.h +++ b/libavcodec/mjpegenc_common.h @@ -41,6 +41,6 @@ void ff_mjpeg_init_hvsample(AVCodecContext *avctx, int hsample[4], int vsample[4 void ff_mjpeg_encode_dc(PutBitContext *pb, int val, uint8_t *huff_size, uint16_t *huff_code); -av_cold void ff_init_uni_ac_vlc(const uint8_t huff_size_ac[256], uint8_t *uni_ac_vlc_len); +av_cold void ff_init_uni_ac_huffman(const uint8_t huff_size_ac[256], uint8_t *uni_ac_vlc_len); #endif /* AVCODEC_MJPEGENC_COMMON_H */ diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index 1ec99f17e1..f01d7197ff 100644 --- a/libavcodec/mpeg12.h +++ b/libavcodec/mpeg12.h @@ -77,4 +77,6 @@ void ff_mpeg12_find_best_frame_rate(AVRational frame_rate, int *code, int *ext_n, int *ext_d, int nonstandard); +void ff_init_uni_ac_vlc(RLTable *rl, uint8_t *uni_ac_vlc_len); + #endif /* AVCODEC_MPEG12_H */ diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 9fbbcef607..c33e20604e 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -64,7 +64,7 @@ static int8_t mpeg1_max_level[2][64]; #define A53_MAX_CC_COUNT 0x1f -static av_cold void init_uni_ac_vlc(RLTable *rl, uint8_t *uni_ac_vlc_len) +av_cold void ff_init_uni_ac_vlc(RLTable *rl, uint8_t *uni_ac_vlc_len) { int i; @@ -1054,9 +1054,9 @@ av_cold void ff_mpeg1_encode_init(MpegEncContext *s) mpeg1_index_run[0][i] = ff_rl_mpeg1.index_run[0][i]; } - init_uni_ac_vlc(&ff_rl_mpeg1, uni_mpeg1_ac_vlc_len); + ff_init_uni_ac_vlc(&ff_rl_mpeg1, uni_mpeg1_ac_vlc_len); if (s->intra_vlc_format) - init_uni_ac_vlc(&ff_rl_mpeg2, uni_mpeg2_ac_vlc_len); + ff_init_uni_ac_vlc(&ff_rl_mpeg2, uni_mpeg2_ac_vlc_len); /* build unified dc encoding tables */ for (i = -255; i < 256; i++) { diff --git a/libavcodec/speedhq.c b/libavcodec/speedhq.c index b834b79f28..86eb725398 100644 --- a/libavcodec/speedhq.c +++ b/libavcodec/speedhq.c @@ -132,7 +132,7 @@ static const uint8_t speedhq_run[121] = { 31, }; -static RLTable ff_rl_speedhq = { +RLTable ff_rl_speedhq = { 121, 121, (const uint16_t (*)[])speedhq_vlc,