virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

avcodec/mlp: Make initializing CRCs thread-safe

Browse Source 
Reviewed-by: Jai Luthra <me@jailuthra.in>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-11-21 00:11:18 +01:00
parent 79ab46ac6e
commit 1f0e27dd66
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/mlp.c
View File

@ -23,6 +23,7 @@
#include "libavutil/crc.h" #include "libavutil/crc.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/thread.h"
#include "mlp.h" #include "mlp.h"
const uint8_t ff_mlp_huffman_tables[3][18][2] = { const uint8_t ff_mlp_huffman_tables[3][18][2] = {
@ -62,7 +63,6 @@ const uint64_t ff_mlp_channel_layouts[12] = {
AV_CH_LAYOUT_4POINT1, AV_CH_LAYOUT_5POINT1_BACK, 0, AV_CH_LAYOUT_4POINT1, AV_CH_LAYOUT_5POINT1_BACK, 0,
}; };
static int crc_init = 0;
#if CONFIG_SMALL #if CONFIG_SMALL
#define CRC_TABLE_SIZE 257 #define CRC_TABLE_SIZE 257
#else #else
@ -72,14 +72,17 @@ static AVCRC crc_63[CRC_TABLE_SIZE];
static AVCRC crc_1D[CRC_TABLE_SIZE]; static AVCRC crc_1D[CRC_TABLE_SIZE];
static AVCRC crc_2D[CRC_TABLE_SIZE]; static AVCRC crc_2D[CRC_TABLE_SIZE];
static av_cold void mlp_init_crc(void)
{
av_crc_init(crc_63, 0, 8, 0x63, sizeof(crc_63));
av_crc_init(crc_1D, 0, 8, 0x1D, sizeof(crc_1D));
av_crc_init(crc_2D, 0, 16, 0x002D, sizeof(crc_2D));
}
av_cold void ff_mlp_init_crc(void) av_cold void ff_mlp_init_crc(void)
{ {
if (!crc_init) { static AVOnce init_static_once = AV_ONCE_INIT;
av_crc_init(crc_63, 0, 8, 0x63, sizeof(crc_63)); ff_thread_once(&init_static_once, mlp_init_crc);
av_crc_init(crc_1D, 0, 8, 0x1D, sizeof(crc_1D));
av_crc_init(crc_2D, 0, 16, 0x002D, sizeof(crc_2D));
crc_init = 1;
}
} }
uint16_t ff_mlp_checksum16(const uint8_t *buf, unsigned int buf_size) uint16_t ff_mlp_checksum16(const uint8_t *buf, unsigned int buf_size)