virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/dvbsubdec: Make decoder init-threadsafe

Browse Source 
Note: This decoder uses a static variable in save_display_set() (which
is only enabled if DEBUG is defined); yet said function can't be reached
from the decoder's init function at all, so it is no problem for
setting the FF_CODEC_CAP_INIT_THREADSAFE flag.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt
2020-12-01 15:48:33 +01:00
committed by Andreas Rheinhardt
parent 834ef6f4a9
commit b3108b1cbc
1 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
libavcodec/dvbsubdec.c
View File

@@ -26,6 +26,7 @@
#include "libavutil/colorspace.h" #include "libavutil/colorspace.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/thread.h"
#define DVBSUB_PAGE_SEGMENT 0x10 #define DVBSUB_PAGE_SEGMENT 0x10
#define DVBSUB_REGION_SEGMENT 0x11 #define DVBSUB_REGION_SEGMENT 0x11
@@ -254,31 +255,9 @@ static void delete_regions(DVBSubContext *ctx)
} }
} }
static av_cold int dvbsub_init_decoder(AVCodecContext *avctx) static av_cold void init_default_clut(void)
{ {
int i, r, g, b, a = 0; int i, r, g, b, a = 0;
DVBSubContext *ctx = avctx->priv_data;
if (ctx->substream < 0) {
ctx->composition_id = -1;
ctx->ancillary_id = -1;
} else if (!avctx->extradata || (avctx->extradata_size < 4) || ((avctx->extradata_size % 5 != 0) && (avctx->extradata_size != 4))) {
av_log(avctx, AV_LOG_WARNING, "Invalid DVB subtitles stream extradata!\n");
ctx->composition_id = -1;
ctx->ancillary_id = -1;
} else {
if (avctx->extradata_size > 5*ctx->substream + 2) {
ctx->composition_id = AV_RB16(avctx->extradata + 5*ctx->substream);
ctx->ancillary_id = AV_RB16(avctx->extradata + 5*ctx->substream + 2);
} else {
av_log(avctx, AV_LOG_WARNING, "Selected DVB subtitles sub-stream %d is not available\n", ctx->substream);
ctx->composition_id = AV_RB16(avctx->extradata);
ctx->ancillary_id = AV_RB16(avctx->extradata + 2);
}
}
ctx->version = -1;
ctx->prev_start = AV_NOPTS_VALUE;
default_clut.id = -1; default_clut.id = -1;
default_clut.next = NULL; default_clut.next = NULL;
@@ -339,6 +318,35 @@ static av_cold int dvbsub_init_decoder(AVCodecContext *avctx)
} }
default_clut.clut256[i] = RGBA(r, g, b, a); default_clut.clut256[i] = RGBA(r, g, b, a);
} }
}
static av_cold int dvbsub_init_decoder(AVCodecContext *avctx)
{
static AVOnce init_static_once = AV_ONCE_INIT;
DVBSubContext *ctx = avctx->priv_data;
if (ctx->substream < 0) {
ctx->composition_id = -1;
ctx->ancillary_id = -1;
} else if (!avctx->extradata || (avctx->extradata_size < 4) || ((avctx->extradata_size % 5 != 0) && (avctx->extradata_size != 4))) {
av_log(avctx, AV_LOG_WARNING, "Invalid DVB subtitles stream extradata!\n");
ctx->composition_id = -1;
ctx->ancillary_id = -1;
} else {
if (avctx->extradata_size > 5*ctx->substream + 2) {
ctx->composition_id = AV_RB16(avctx->extradata + 5*ctx->substream);
ctx->ancillary_id = AV_RB16(avctx->extradata + 5*ctx->substream + 2);
} else {
av_log(avctx, AV_LOG_WARNING, "Selected DVB subtitles sub-stream %d is not available\n", ctx->substream);
ctx->composition_id = AV_RB16(avctx->extradata);
ctx->ancillary_id = AV_RB16(avctx->extradata + 2);
}
}
ctx->version = -1;
ctx->prev_start = AV_NOPTS_VALUE;
ff_thread_once(&init_static_once, init_default_clut);
return 0; return 0;
} }
@@ -1747,4 +1755,5 @@ const AVCodec ff_dvbsub_decoder = {
.close = dvbsub_close_decoder, .close = dvbsub_close_decoder,
.decode = dvbsub_decode, .decode = dvbsub_decode,
.priv_class = &dvbsubdec_class, .priv_class = &dvbsubdec_class,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
}; };