MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/dsd: Make initializing DSD tables thread-safe

Browse Source 
This automatically makes the DSD formats as well as DST and WavPack
init-threadsafe.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-11-23 04:20:07 +01:00
parent fd5d66af74
commit 4f5bd6177d
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/dsd.c
View File

@ -21,6 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/thread.h"
#include "libavcodec/internal.h"
#include "libavcodec/mathops.h"
#include "avcodec.h"
@ -45,11 +46,8 @@ static av_cold void dsd_ctables_tableinit(void)
av_cold void ff_init_dsd_data(void)
{
static int done = 0;
if (done)
return;
dsd_ctables_tableinit();
done = 1;
static AVOnce init_static_once = AV_ONCE_INIT;
ff_thread_once(&init_static_once, dsd_ctables_tableinit);
}
void ff_dsd2pcm_translate(DSDContext* s, size_t samples, int lsbf,

1
libavcodec/dsddec.c
View File

@ -125,6 +125,7 @@ AVCodec ff_##name_##_decoder = { \
.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS, \
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, \
AV_SAMPLE_FMT_NONE }, \
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, \
};
DSD_DECODER(DSD_LSBF, dsd_lsbf, "DSD (Direct Stream Digital), least significant bit first")

1
libavcodec/dstdec.c
View File

@ -389,4 +389,5 @@ AVCodec ff_dst_decoder = {
.capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLT,
AV_SAMPLE_FMT_NONE },
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};

3
libavcodec/wavpack.c
View File

@ -1712,5 +1712,6 @@ AVCodec ff_wavpack_decoder = {
.update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context),
.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS |
AV_CODEC_CAP_SLICE_THREADS,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_ALLOCATE_PROGRESS,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP |
FF_CODEC_CAP_ALLOCATE_PROGRESS,
};