diff mbox

[FFmpeg-devel,2/4] avcodec/parser: use a mutex instead of atomics in av_register_codec_parser()

Message ID 20180104181904.5816-2-jamrial@gmail.com
State Accepted
Commit d36335bda5e5eff317240c098337cbfc57906897
Headers show

Commit Message

James Almer Jan. 4, 2018, 6:19 p.m. UTC 
Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavcodec/parser.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

Comments

Michael Niedermayer Jan. 4, 2018, 11:55 p.m. UTC | #1 
On Thu, Jan 04, 2018 at 03:19:02PM -0300, James Almer wrote:
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  libavcodec/parser.c | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)

LGTM

thx

[...]
James Almer Jan. 5, 2018, 12:57 a.m. UTC | #2 
On 1/4/2018 8:55 PM, Michael Niedermayer wrote:
> On Thu, Jan 04, 2018 at 03:19:02PM -0300, James Almer wrote:
>> Signed-off-by: James Almer <jamrial@gmail.com>
>> ---
>>  libavcodec/parser.c | 11 +++++++----
>>  1 file changed, 7 insertions(+), 4 deletions(-)
> 
> LGTM
> 
> thx

Pushed, thanks.
diff mbox

Patch

diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 670680ea7c..747ea2ee8a 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -25,9 +25,9 @@ 
 #include <string.h>
 
 #include "libavutil/avassert.h"
-#include "libavutil/atomic.h"
 #include "libavutil/internal.h"
 #include "libavutil/mem.h"
+#include "libavutil/thread.h"
 
 #include "internal.h"
 #include "parser.h"
@@ -42,11 +42,14 @@  AVCodecParser *av_parser_next(const AVCodecParser *p)
         return av_first_parser;
 }
 
+static AVMutex parser_register_mutex = AV_MUTEX_INITIALIZER;
+
 void av_register_codec_parser(AVCodecParser *parser)
 {
-    do {
-        parser->next = av_first_parser;
-    } while (parser->next != avpriv_atomic_ptr_cas((void * volatile *)&av_first_parser, parser->next, parser));
+    ff_mutex_lock(&parser_register_mutex);
+    parser->next = av_first_parser;
+    av_first_parser = parser;
+    ff_mutex_unlock(&parser_register_mutex);
 }
 
 AVCodecParserContext *av_parser_init(int codec_id)