FFmpeg/FFmpeg
5
Fork 8
Code Issues Pull requests 4 Releases Wiki Activity Actions

swscale/utils: add return code to fill_xyztables()

Browse source 
Needed for lazy allocation of XYZ tables.

Signed-off-by: Niklas Haas <git@haasn.dev>
This commit is contained in:
Niklas Haas 2024-12-23 13:13:00 +01:00
parent af6d52eec6
commit 60bfafcd8a
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
libswscale/utils.c
View file

@ -936,7 +936,7 @@ static void fill_rgb2yuv_table(SwsInternal *c, const int table[4], int dstRange)
AV_WL16(p + 16*4 + 2*i, map[i] >= 0 ? c->input_rgb2yuv_table[map[i]] : 0); AV_WL16(p + 16*4 + 2*i, map[i] >= 0 ? c->input_rgb2yuv_table[map[i]] : 0);
} }
static void fill_xyztables(SwsInternal *c) static int fill_xyztables(SwsInternal *c)
{ {
int i; int i;
double xyzgamma = XYZ_GAMMA; double xyzgamma = XYZ_GAMMA;
@ -962,7 +962,7 @@ static void fill_xyztables(SwsInternal *c)
c->rgbgammainv = rgbgammainv_tab; c->rgbgammainv = rgbgammainv_tab;
if (xyzgamma_tab[4095]) if (xyzgamma_tab[4095])
return; return 0;
/* set input gamma vectors */ /* set input gamma vectors */
for (i = 0; i < 4096; i++) { for (i = 0; i < 4096; i++) {
@ -975,6 +975,7 @@ static void fill_xyztables(SwsInternal *c)
rgbgamma_tab[i] = lrint(pow(i / 65535.0, rgbgamma) * 4095.0); rgbgamma_tab[i] = lrint(pow(i / 65535.0, rgbgamma) * 4095.0);
xyzgammainv_tab[i] = lrint(pow(i / 65535.0, xyzgammainv) * 4095.0); xyzgammainv_tab[i] = lrint(pow(i / 65535.0, xyzgammainv) * 4095.0);
} }
return 0;
} }
static int handle_jpeg(enum AVPixelFormat *format) static int handle_jpeg(enum AVPixelFormat *format)
@ -1035,7 +1036,7 @@ static int handle_xyz(enum AVPixelFormat *format)
} }
} }
static void handle_formats(SwsContext *sws) static int handle_formats(SwsContext *sws)
{ {
SwsInternal *c = sws_internal(sws); SwsInternal *c = sws_internal(sws);
c->src0Alpha |= handle_0alpha(&sws->src_format); c->src0Alpha |= handle_0alpha(&sws->src_format);
@ -1043,7 +1044,9 @@ static void handle_formats(SwsContext *sws)
c->srcXYZ |= handle_xyz(&sws->src_format); c->srcXYZ |= handle_xyz(&sws->src_format);
c->dstXYZ |= handle_xyz(&sws->dst_format); c->dstXYZ |= handle_xyz(&sws->dst_format);
if (c->srcXYZ || c->dstXYZ) if (c->srcXYZ || c->dstXYZ)
fill_xyztables(c); return fill_xyztables(c);
else
return 0;
} }
static int range_override_needed(enum AVPixelFormat format) static int range_override_needed(enum AVPixelFormat format)
@ -1058,7 +1061,7 @@ int sws_setColorspaceDetails(SwsContext *sws, const int inv_table[4],
SwsInternal *c = sws_internal(sws); SwsInternal *c = sws_internal(sws);
const AVPixFmtDescriptor *desc_dst; const AVPixFmtDescriptor *desc_dst;
const AVPixFmtDescriptor *desc_src; const AVPixFmtDescriptor *desc_src;
int need_reinit = 0; int ret, need_reinit = 0;
if (c->nb_slice_ctx) { if (c->nb_slice_ctx) {
int parent_ret = 0; int parent_ret = 0;
@ -1073,7 +1076,9 @@ int sws_setColorspaceDetails(SwsContext *sws, const int inv_table[4],
return parent_ret; return parent_ret;
} }
handle_formats(sws); ret = handle_formats(sws);
if (ret < 0)
return ret;
desc_dst = av_pix_fmt_desc_get(sws->dst_format); desc_dst = av_pix_fmt_desc_get(sws->dst_format);
desc_src = av_pix_fmt_desc_get(sws->src_format); desc_src = av_pix_fmt_desc_get(sws->src_format);
@ -1353,7 +1358,9 @@ av_cold int ff_sws_init_single_context(SwsContext *sws, SwsFilter *srcFilter,
ff_yuv2rgb_coeffs[SWS_CS_DEFAULT], ff_yuv2rgb_coeffs[SWS_CS_DEFAULT],
sws->dst_range, 0, 1 << 16, 1 << 16); sws->dst_range, 0, 1 << 16, 1 << 16);
handle_formats(sws); ret = handle_formats(sws);
if (ret < 0)
return ret;
srcFormat = sws->src_format; srcFormat = sws->src_format;
dstFormat = sws->dst_format; dstFormat = sws->dst_format;
desc_src = av_pix_fmt_desc_get(srcFormat); desc_src = av_pix_fmt_desc_get(srcFormat);