diff options
| author | Anton Khirnov <anton@khirnov.net> | 2017-01-09 18:04:42 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2020-04-10 15:24:54 +0200 |
| commit | 1f4cf92cfbd3accbae582ac63126ed5570ddfd37 (patch) | |
| tree | 0d08c281a748689d53350a929fb0df022dc6ef2c /libavcodec/lcldec.c | |
| parent | 665e5b0fba41a8bae2269d9ce8929a24002e5907 (diff) | |
pthread_frame: merge the functionality for normal decoder init and init_thread_copy
The current design, where
- proper init is called for the first per-thread context
- first thread's private data is copied into private data for all the
other threads
- a "fixup" function is called for all the other threads to e.g.
allocate dynamically allocated data
is very fragile and hard to follow, so it is abandoned. Instead, the
same init function is used to init each per-thread context. Where
necessary, AVCodecInternal.is_copy can be used to differentiate between
the first thread and the other ones (e.g. for decoding the extradata
just once).
Diffstat (limited to 'libavcodec/lcldec.c')
| -rw-r--r-- | libavcodec/lcldec.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c index 046cdc4f8e..c51083bdf2 100644 --- a/libavcodec/lcldec.c +++ b/libavcodec/lcldec.c @@ -622,13 +622,6 @@ static av_cold int decode_init(AVCodecContext *avctx) return 0; } -#if HAVE_THREADS -static int init_thread_copy(AVCodecContext *avctx) -{ - return decode_init(avctx); -} -#endif - static av_cold int decode_end(AVCodecContext *avctx) { LclDecContext * const c = avctx->priv_data; @@ -650,7 +643,6 @@ AVCodec ff_mszh_decoder = { .id = AV_CODEC_ID_MSZH, .priv_data_size = sizeof(LclDecContext), .init = decode_init, - .init_thread_copy = ONLY_IF_THREADS_ENABLED(init_thread_copy), .close = decode_end, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, @@ -666,7 +658,6 @@ AVCodec ff_zlib_decoder = { .id = AV_CODEC_ID_ZLIB, .priv_data_size = sizeof(LclDecContext), .init = decode_init, - .init_thread_copy = ONLY_IF_THREADS_ENABLED(init_thread_copy), .close = decode_end, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, |