History

dnn: fix issue when pthread is not supported

Guo, Yejun committed 5 years ago

Commit 97f520b1 parent 8e78d5d2 files · +41 −16Browse files

Showing the changes to libavfilter (2 of 2 files). Show all

Unified · Split

2 files
  1. libavfilter/dnn/safe_queue.c +34 −16
  2. libavfilter/vf_dnn_processing.c +7 −0
libavfilter/dnn/safe_queue.c+34−16
@@ -25,10 +25,28 @@ · 24 unmodified lines
2525 #include "libavutil/avassert.h"
2626 #include "libavutil/thread.h"
2727
28+#if HAVE_PTHREAD_CANCEL
29+#define DNNCond pthread_cond_t
30+#define dnn_cond_init pthread_cond_init
31+#define dnn_cond_destroy pthread_cond_destroy
32+#define dnn_cond_signal pthread_cond_signal
33+#define dnn_cond_wait pthread_cond_wait
34+#else
35+#define DNNCond char
36+static inline int dnn_cond_init(DNNCond *cond, const void *attr) { return 0; }
37+static inline int dnn_cond_destroy(DNNCond *cond) { return 0; }
38+static inline int dnn_cond_signal(DNNCond *cond) { return 0; }
39+static inline int dnn_cond_wait(DNNCond *cond, AVMutex *mutex)
40+{
41+ av_assert0(!"should not reach here");
42+ return 0;
43+}
44+#endif
45+
2846 struct FFSafeQueue {
2947 FFQueue *q;
30− pthread_mutex_t mutex;
31− pthread_cond_t cond;
48+ AVMutex mutex;
49+ DNNCond cond;
3250 };
3351
3452 FFSafeQueue *ff_safe_queue_create(void)
@@ -41,8 +59,8 @@ FFSafeQueue *ff_safe_queue_create(void) · 6 unmodified lines
4159 if (!sq->q)
4260 return NULL;
4361
44− pthread_mutex_init(&sq->mutex, NULL);
45− pthread_cond_init(&sq->cond, NULL);
62+ ff_mutex_init(&sq->mutex, NULL);
63+ dnn_cond_init(&sq->cond, NULL);
4664 return sq;
4765 }
4866
@@ -52,8 +70,8 @@ void ff_safe_queue_destroy(FFSafeQueue *sq) · 3 unmodified lines
5270 return;
5371
5472 ff_queue_destroy(sq->q);
55− pthread_mutex_destroy(&sq->mutex);
56− pthread_cond_destroy(&sq->cond);
73+ ff_mutex_destroy(&sq->mutex);
74+ dnn_cond_destroy(&sq->cond);
5775 av_freep(&sq);
5876 }
5977
@@ -64,29 +82,29 @@ size_t ff_safe_queue_size(FFSafeQueue *sq) · 4 unmodified lines
6482
6583 void ff_safe_queue_push_front(FFSafeQueue *sq, void *v)
6684 {
67− pthread_mutex_lock(&sq->mutex);
85+ ff_mutex_lock(&sq->mutex);
6886 ff_queue_push_front(sq->q, v);
69− pthread_cond_signal(&sq->cond);
70− pthread_mutex_unlock(&sq->mutex);
87+ dnn_cond_signal(&sq->cond);
88+ ff_mutex_unlock(&sq->mutex);
7189 }
7290
7391 void ff_safe_queue_push_back(FFSafeQueue *sq, void *v)
7492 {
75− pthread_mutex_lock(&sq->mutex);
93+ ff_mutex_lock(&sq->mutex);
7694 ff_queue_push_back(sq->q, v);
77− pthread_cond_signal(&sq->cond);
78− pthread_mutex_unlock(&sq->mutex);
95+ dnn_cond_signal(&sq->cond);
96+ ff_mutex_unlock(&sq->mutex);
7997 }
8098
8199 void *ff_safe_queue_pop_front(FFSafeQueue *sq)
82100 {
83101 void *value;
84− pthread_mutex_lock(&sq->mutex);
102+ ff_mutex_lock(&sq->mutex);
85103 while (ff_queue_size(sq->q) == 0) {
86− pthread_cond_wait(&sq->cond, &sq->mutex);
104+ dnn_cond_wait(&sq->cond, &sq->mutex);
87105 }
88106 value = ff_queue_pop_front(sq->q);
89− pthread_cond_signal(&sq->cond);
90− pthread_mutex_unlock(&sq->mutex);
107+ dnn_cond_signal(&sq->cond);
108+ ff_mutex_unlock(&sq->mutex);
91109 return value;
92110 }
libavfilter/vf_dnn_processing.c+7−0
@@ -110,6 +110,13 @@ static av_cold int init(AVFilterContext *context) · 109 unmodified lines
110110 av_log(ctx, AV_LOG_WARNING, "this backend does not support async execution, roll back to sync.\n");
111111 }
112112
113+#if !HAVE_PTHREAD_CANCEL
114+ if (ctx->async) {
115+ ctx->async = 0;
116+ av_log(ctx, AV_LOG_WARNING, "pthread is not supported, roll back to sync.\n");
117+ }
118+#endif
119+
113120 return 0;
114121 }
115122

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t