highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

swscale/utils: Avoid calling ff_thread_once() unnecessarily

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2022-11-19 05:44:44 +01:00
parent 8ee0711228
commit baccc1c541
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libswscale/utils.c
View File

@@ -1340,13 +1340,10 @@ static av_cold int sws_init_single_context(SwsContext *c, SwsFilter *srcFilter,
int ret = 0; int ret = 0;
enum AVPixelFormat tmpFmt; enum AVPixelFormat tmpFmt;
static const float float_mult = 1.0f / 255.0f; static const float float_mult = 1.0f / 255.0f;
static AVOnce rgb2rgb_once = AV_ONCE_INIT;
cpu_flags = av_get_cpu_flags(); cpu_flags = av_get_cpu_flags();
flags = c->flags; flags = c->flags;
emms_c(); emms_c();
if (ff_thread_once(&rgb2rgb_once, ff_sws_rgb2rgb_init) != 0)
return AVERROR_UNKNOWN;
unscaled = (srcW == dstW && srcH == dstH); unscaled = (srcW == dstW && srcH == dstH);
@@ -2043,6 +2040,7 @@ fail: // FIXME replace things by appropriate error codes
av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
SwsFilter *dstFilter) SwsFilter *dstFilter)
{ {
static AVOnce rgb2rgb_once = AV_ONCE_INIT;
int ret; int ret;
c->frame_src = av_frame_alloc(); c->frame_src = av_frame_alloc();
@@ -2050,6 +2048,9 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
if (!c->frame_src || !c->frame_dst) if (!c->frame_src || !c->frame_dst)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if (ff_thread_once(&rgb2rgb_once, ff_sws_rgb2rgb_init) != 0)
return AVERROR_UNKNOWN;
if (c->nb_threads != 1) { if (c->nb_threads != 1) {
ret = context_init_threaded(c, srcFilter, dstFilter); ret = context_init_threaded(c, srcFilter, dstFilter);
if (ret < 0 || c->nb_threads > 1) if (ret < 0 || c->nb_threads > 1)