virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/apv_decode: build the lut table only once

Browse Source 
No reason to build the exact same table once per decoding thread.

Reviewed-by: Mark Thompson <sw@jkqxz.net>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2025-05-03 22:41:19 -03:00
parent 0af1d69959
commit a9557c1f26
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/apv_decode.c
View File

@@ -19,6 +19,7 @@
#include "libavutil/mastering_display_metadata.h" #include "libavutil/mastering_display_metadata.h"
#include "libavutil/mem_internal.h" #include "libavutil/mem_internal.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "libavutil/thread.h"
#include "apv.h" #include "apv.h"
#include "apv_decode.h" #include "apv_decode.h"
@@ -39,8 +40,6 @@ typedef struct APVDecodeContext {
CodedBitstreamFragment au; CodedBitstreamFragment au;
APVDerivedTileInfo tile_info; APVDerivedTileInfo tile_info;
APVVLCLUT decode_lut;
AVFrame *output_frame; AVFrame *output_frame;
uint8_t warned_additional_frames; uint8_t warned_additional_frames;
@@ -55,6 +54,8 @@ static const enum AVPixelFormat apv_format_table[5][5] = {
{ AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA444P12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_YUVA444P16 }, { AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA444P12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_YUVA444P16 },
}; };
static APVVLCLUT decode_lut;
static int apv_decode_check_format(AVCodecContext *avctx, static int apv_decode_check_format(AVCodecContext *avctx,
const APVRawFrameHeader *header) const APVRawFrameHeader *header)
{ {
@@ -101,11 +102,20 @@ static const CodedBitstreamUnitType apv_decompose_unit_types[] = {
APV_PBU_METADATA, APV_PBU_METADATA,
}; };
static AVOnce apv_entropy_once = AV_ONCE_INIT;
static av_cold void apv_entropy_build_decode_lut(void)
{
ff_apv_entropy_build_decode_lut(&decode_lut);
}
static av_cold int apv_decode_init(AVCodecContext *avctx) static av_cold int apv_decode_init(AVCodecContext *avctx)
{ {
APVDecodeContext *apv = avctx->priv_data; APVDecodeContext *apv = avctx->priv_data;
int err; int err;
ff_thread_once(&apv_entropy_once, apv_entropy_build_decode_lut);
err = ff_cbs_init(&apv->cbc, AV_CODEC_ID_APV, avctx); err = ff_cbs_init(&apv->cbc, AV_CODEC_ID_APV, avctx);
if (err < 0) if (err < 0)
return err; return err;
@@ -117,8 +127,6 @@ static av_cold int apv_decode_init(AVCodecContext *avctx)
// Extradata could be set here, but is ignored by the decoder. // Extradata could be set here, but is ignored by the decoder.
ff_apv_entropy_build_decode_lut(&apv->decode_lut);
ff_apv_dsp_init(&apv->dsp); ff_apv_dsp_init(&apv->dsp);
return 0; return 0;
@@ -201,7 +209,7 @@ static int apv_decode_tile_component(AVCodecContext *avctx, void *data,
APVEntropyState entropy_state = { APVEntropyState entropy_state = {
.log_ctx = avctx, .log_ctx = avctx,
.decode_lut = &apv->decode_lut, .decode_lut = &decode_lut,
.prev_dc = 0, .prev_dc = 0,
.prev_dc_diff = 20, .prev_dc_diff = 20,
.prev_1st_ac_level = 0, .prev_1st_ac_level = 0,