From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH 1/2] avcodec/leaddec: Remove unnecessary VLC structures
Date: Fri, 2 Feb 2024 12:30:08 +0100
Message-ID: <AS8P250MB0744B7A68C059FD1FC64DEDA8F422@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <AS8P250MB074402F59F2937CF2086D57F8F7C2@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM>
Andreas Rheinhardt:
> One only needs the VLCElem[].
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> libavcodec/leaddec.c | 48 ++++++++++++++++++++++----------------------
> 1 file changed, 24 insertions(+), 24 deletions(-)
>
> diff --git a/libavcodec/leaddec.c b/libavcodec/leaddec.c
> index 4e97479b03..489fe501b6 100644
> --- a/libavcodec/leaddec.c
> +++ b/libavcodec/leaddec.c
> @@ -38,29 +38,29 @@
> #define LUMA_AC_BITS 10
> #define CHROMA_AC_BITS 10
>
> -static VLC luma_dc_vlc;
> -static VLC chroma_dc_vlc;
> -static VLC luma_ac_vlc;
> -static VLC chroma_ac_vlc;
> +static VLCElem luma_dc_vlc[1 << LUMA_DC_BITS];
> +static VLCElem chroma_dc_vlc[1 << CHROMA_DC_BITS];
> +static VLCElem luma_ac_vlc[1160];
> +static VLCElem chroma_ac_vlc[1160];
>
> static av_cold void lead_init_static_data(void)
> {
> - VLC_INIT_STATIC_FROM_LENGTHS(&luma_dc_vlc, LUMA_DC_BITS, FF_ARRAY_ELEMS(luma_dc_len),
> - luma_dc_len, 1,
> - 0, 0, 0,
> - 0, 0, 1 << LUMA_DC_BITS);
> - VLC_INIT_STATIC_FROM_LENGTHS(&chroma_dc_vlc, CHROMA_DC_BITS, FF_ARRAY_ELEMS(chroma_dc_len),
> - chroma_dc_len, 1,
> - 0, 0, 0,
> - 0, 0, 1 << CHROMA_DC_BITS);
> - VLC_INIT_STATIC_FROM_LENGTHS(&luma_ac_vlc, LUMA_AC_BITS, FF_ARRAY_ELEMS(luma_ac_len),
> - luma_ac_len, 1,
> - ff_mjpeg_val_ac_luminance, 1, 1,
> - 0, 0, 1160);
> - VLC_INIT_STATIC_FROM_LENGTHS(&chroma_ac_vlc, CHROMA_AC_BITS, FF_ARRAY_ELEMS(chroma_ac_len),
> - chroma_ac_len, 1,
> - ff_mjpeg_val_ac_chrominance, 1, 1,
> - 0, 0, 1160);
> + VLC_INIT_STATIC_TABLE_FROM_LENGTHS(luma_dc_vlc, LUMA_DC_BITS, FF_ARRAY_ELEMS(luma_dc_len),
> + luma_dc_len, 1,
> + NULL, 0, 0,
> + 0, 0);
> + VLC_INIT_STATIC_TABLE_FROM_LENGTHS(chroma_dc_vlc, CHROMA_DC_BITS, FF_ARRAY_ELEMS(chroma_dc_len),
> + chroma_dc_len, 1,
> + NULL, 0, 0,
> + 0, 0);
> + VLC_INIT_STATIC_TABLE_FROM_LENGTHS(luma_ac_vlc, LUMA_AC_BITS, FF_ARRAY_ELEMS(luma_ac_len),
> + luma_ac_len, 1,
> + ff_mjpeg_val_ac_luminance, 1, 1,
> + 0, 0);
> + VLC_INIT_STATIC_TABLE_FROM_LENGTHS(chroma_ac_vlc, CHROMA_AC_BITS, FF_ARRAY_ELEMS(chroma_ac_len),
> + chroma_ac_len, 1,
> + ff_mjpeg_val_ac_chrominance, 1, 1,
> + 0, 0);
> }
>
> typedef struct LeadContext {
> @@ -199,9 +199,9 @@ static int lead_decode_frame(AVCodecContext *avctx, AVFrame * frame,
> for (int mb_x = 0; mb_x < avctx->width / 16; mb_x++)
> for (int b = 0; b < (yuv20p_half ? 4 : 6); b++) {
> int luma_block = yuv20p_half ? 2 : 4;
> - const VLCElem * dc_vlc = b < luma_block ? luma_dc_vlc.table : chroma_dc_vlc.table;
> + const VLCElem * dc_vlc = b < luma_block ? luma_dc_vlc : chroma_dc_vlc;
> int dc_bits = b < luma_block ? LUMA_DC_BITS : CHROMA_DC_BITS;
> - const VLCElem * ac_vlc = b < luma_block ? luma_ac_vlc.table : chroma_ac_vlc.table;
> + const VLCElem * ac_vlc = b < luma_block ? luma_ac_vlc : chroma_ac_vlc;
> int ac_bits = b < luma_block ? LUMA_AC_BITS : CHROMA_AC_BITS;
> int plane = b < luma_block ? 0 : b - (yuv20p_half ? 1 : 3);
> int x, y;
> @@ -231,9 +231,9 @@ static int lead_decode_frame(AVCodecContext *avctx, AVFrame * frame,
> for (int j = 0; j < avctx->height / fields / 8; j++)
> for (int i = 0; i < avctx->width / 8; i++)
> for (int plane = 0; plane < 3; plane++) {
> - const VLCElem * dc_vlc = !plane ? luma_dc_vlc.table : chroma_dc_vlc.table;
> + const VLCElem * dc_vlc = !plane ? luma_dc_vlc : chroma_dc_vlc;
> int dc_bits = !plane ? LUMA_DC_BITS : CHROMA_DC_BITS;
> - const VLCElem * ac_vlc = !plane ? luma_ac_vlc.table : chroma_ac_vlc.table;
> + const VLCElem * ac_vlc = !plane ? luma_ac_vlc : chroma_ac_vlc;
> int ac_bits = !plane ? LUMA_AC_BITS : CHROMA_AC_BITS;
>
> ret = decode_block(s, &gb, dc_vlc, dc_bits, ac_vlc, ac_bits,
Will apply this patchset tomorrow unless there are objections.
- Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
prev parent reply other threads:[~2024-02-02 11:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-31 9:27 Andreas Rheinhardt
2024-01-31 9:31 ` [FFmpeg-devel] [PATCH 2/2] avcodec/vlc: Remove unused macros Andreas Rheinhardt
2024-02-02 11:30 ` Andreas Rheinhardt [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AS8P250MB0744B7A68C059FD1FC64DEDA8F422@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM \
--to=andreas.rheinhardt@outlook.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git