History

dnn: fix redefining typedefs and also refine naming with correct prefix

The prefix for symbols not exported from the library and not local to one translation unit is ff_ (or FF for types).

Guo, Yejun committed 5 years ago

Commit 8e78d5d1 parent 53c56585 files · +83 −83Browse files

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

Unified · Split

5 files
  1. libavfilter/dnn/dnn_backend_openvino.c +16 −16
  2. libavfilter/dnn/queue.c +33 −33
  3. libavfilter/dnn/queue.h +10 −10
  4. libavfilter/dnn/safe_queue.c +17 −17
  5. libavfilter/dnn/safe_queue.h +7 −7
libavfilter/dnn/dnn_backend_openvino.c+16−16
@@ -53,8 +53,8 @@ typedef struct OVModel{ · 52 unmodified lines
5353 ie_infer_request_t *infer_request;
5454
5555 /* for async execution */
56− safe_queue *request_queue; // holds RequestItem
57− queue *task_queue; // holds TaskItem
56+ FFSafeQueue *request_queue; // holds RequestItem
57+ FFQueue *task_queue; // holds TaskItem
5858 } OVModel;
5959
6060 typedef struct TaskItem {
@@ -208,7 +208,7 @@ static void infer_completion_callback(void *args) · 147 unmodified lines
208208
209209 if (task->async) {
210210 request->task = NULL;
211− safe_queue_push_back(task->ov_model->request_queue, request);
211+ ff_safe_queue_push_back(task->ov_model->request_queue, request);
212212 }
213213
214214 task->done = 1;
@@ -417,7 +417,7 @@ DNNModel *ff_dnn_load_model_ov(const char *model_filename, const char *options, · 202 unmodified lines
417417 ctx->options.nireq = av_cpu_count() / 2 + 1;
418418 }
419419
420− ov_model->request_queue = safe_queue_create();
420+ ov_model->request_queue = ff_safe_queue_create();
421421 if (!ov_model->request_queue) {
422422 goto err;
423423 }
@@ -436,10 +436,10 @@ DNNModel *ff_dnn_load_model_ov(const char *model_filename, const char *options, · 12 unmodified lines
436436 item->infer_request = request;
437437 item->callback.completeCallBackFunc = infer_completion_callback;
438438 item->callback.args = item;
439− safe_queue_push_back(ov_model->request_queue, item);
439+ ff_safe_queue_push_back(ov_model->request_queue, item);
440440 }
441441
442− ov_model->task_queue = queue_create();
442+ ov_model->task_queue = ff_queue_create();
443443 if (!ov_model->task_queue) {
444444 goto err;
445445 }
@@ -527,9 +527,9 @@ DNNReturnType ff_dnn_execute_model_async_ov(const DNNModel *model, const char *i · 81 unmodified lines
527527 task->output_name = output_names[0];
528528 task->out_frame = out_frame;
529529 task->ov_model = ov_model;
530− queue_push_back(ov_model->task_queue, task);
530+ ff_queue_push_back(ov_model->task_queue, task);
531531
532− request = safe_queue_pop_front(ov_model->request_queue);
532+ request = ff_safe_queue_pop_front(ov_model->request_queue);
533533 if (!request) {
534534 av_log(ctx, AV_LOG_ERROR, "unable to get infer request.\n");
535535 return DNN_ERROR;
@@ -541,7 +541,7 @@ DNNReturnType ff_dnn_execute_model_async_ov(const DNNModel *model, const char *i · 5 unmodified lines
541541 DNNAsyncStatusType ff_dnn_get_async_result_ov(const DNNModel *model, AVFrame **in, AVFrame **out)
542542 {
543543 OVModel *ov_model = (OVModel *)model->model;
544− TaskItem *task = queue_peek_front(ov_model->task_queue);
544+ TaskItem *task = ff_queue_peek_front(ov_model->task_queue);
545545
546546 if (!task) {
547547 return DAST_EMPTY_QUEUE;
@@ -553,7 +553,7 @@ DNNAsyncStatusType ff_dnn_get_async_result_ov(const DNNModel *model, AVFrame **i · 5 unmodified lines
553553
554554 *in = task->in_frame;
555555 *out = task->out_frame;
556− queue_pop_front(ov_model->task_queue);
556+ ff_queue_pop_front(ov_model->task_queue);
557557 av_freep(&task);
558558
559559 return DAST_SUCCESS;
@@ -563,20 +563,20 @@ void ff_dnn_free_model_ov(DNNModel **model) · 3 unmodified lines
563563 {
564564 if (*model){
565565 OVModel *ov_model = (OVModel *)(*model)->model;
566− while (safe_queue_size(ov_model->request_queue) != 0) {
567− RequestItem *item = safe_queue_pop_front(ov_model->request_queue);
566+ while (ff_safe_queue_size(ov_model->request_queue) != 0) {
567+ RequestItem *item = ff_safe_queue_pop_front(ov_model->request_queue);
568568 if (item && item->infer_request) {
569569 ie_infer_request_free(&item->infer_request);
570570 }
571571 av_freep(&item);
572572 }
573− safe_queue_destroy(ov_model->request_queue);
573+ ff_safe_queue_destroy(ov_model->request_queue);
574574
575− while (queue_size(ov_model->task_queue) != 0) {
576− TaskItem *item = queue_pop_front(ov_model->task_queue);
575+ while (ff_queue_size(ov_model->task_queue) != 0) {
576+ TaskItem *item = ff_queue_pop_front(ov_model->task_queue);
577577 av_freep(&item);
578578 }
579− queue_destroy(ov_model->task_queue);
579+ ff_queue_destroy(ov_model->task_queue);
580580
581581 if (ov_model->infer_request)
582582 ie_infer_request_free(&ov_model->infer_request);
libavfilter/dnn/queue.c+33−33
@@ -23,31 +23,31 @@ · 22 unmodified lines
2323 #include "libavutil/mem.h"
2424 #include "libavutil/avassert.h"
2525
26−typedef struct _queue_entry queue_entry;
26+typedef struct FFQueueEntry FFQueueEntry;
2727
28−typedef struct _queue {
29− queue_entry *head;
30− queue_entry *tail;
31− size_t length;
32−}queue;
33−
34−typedef struct _queue_entry {
28+struct FFQueueEntry {
3529 void *value;
36− queue_entry *prev;
37− queue_entry *next;
38−} queue_entry;
30+ FFQueueEntry *prev;
31+ FFQueueEntry *next;
32+};
33+
34+struct FFQueue {
35+ FFQueueEntry *head;
36+ FFQueueEntry *tail;
37+ size_t length;
38+};
3939
40−static inline queue_entry *create_entry(void *val)
40+static inline FFQueueEntry *create_entry(void *val)
4141 {
42− queue_entry *entry = av_malloc(sizeof(*entry));
42+ FFQueueEntry *entry = av_malloc(sizeof(*entry));
4343 av_assert0(entry != NULL);
4444 entry->value = val;
4545 return entry;
4646 }
4747
48−queue* queue_create(void)
48+FFQueue* ff_queue_create(void)
4949 {
50− queue *q = av_malloc(sizeof(*q));
50+ FFQueue *q = av_malloc(sizeof(*q));
5151 if (!q)
5252 return NULL;
5353
@@ -62,15 +62,15 @@ queue* queue_create(void) · 8 unmodified lines
6262 return q;
6363 }
6464
65−void queue_destroy(queue *q)
65+void ff_queue_destroy(FFQueue *q)
6666 {
67− queue_entry *entry;
67+ FFQueueEntry *entry;
6868 if (!q)
6969 return;
7070
7171 entry = q->head;
7272 while (entry != NULL) {
73− queue_entry *temp = entry;
73+ FFQueueEntry *temp = entry;
7474 entry = entry->next;
7575 av_freep(&temp);
7676 }
@@ -78,12 +78,12 @@ void queue_destroy(queue *q) · 1 unmodified line
7878 av_freep(&q);
7979 }
8080
81−size_t queue_size(queue *q)
81+size_t ff_queue_size(FFQueue *q)
8282 {
8383 return q ? q->length : 0;
8484 }
8585
86−void *queue_peek_front(queue *q)
86+void *ff_queue_peek_front(FFQueue *q)
8787 {
8888 if (!q || q->length == 0)
8989 return NULL;
@@ -91,7 +91,7 @@ void *queue_peek_front(queue *q) · 1 unmodified line
9191 return q->head->next->value;
9292 }
9393
94−void *queue_peek_back(queue *q)
94+void *ff_queue_peek_back(FFQueue *q)
9595 {
9696 if (!q || q->length == 0)
9797 return NULL;
@@ -99,10 +99,10 @@ void *queue_peek_back(queue *q) · 1 unmodified line
9999 return q->tail->prev->value;
100100 }
101101
102−void queue_push_front(queue *q, void *v)
102+void ff_queue_push_front(FFQueue *q, void *v)
103103 {
104− queue_entry *new_entry;
105− queue_entry *original_next;
104+ FFQueueEntry *new_entry;
105+ FFQueueEntry *original_next;
106106 if (!q)
107107 return;
108108
@@ -116,10 +116,10 @@ void queue_push_front(queue *q, void *v) · 7 unmodified lines
116116 q->length++;
117117 }
118118
119−void queue_push_back(queue *q, void *v)
119+void ff_queue_push_back(FFQueue *q, void *v)
120120 {
121− queue_entry *new_entry;
122− queue_entry *original_prev;
121+ FFQueueEntry *new_entry;
122+ FFQueueEntry *original_prev;
123123 if (!q)
124124 return;
125125
@@ -133,10 +133,10 @@ void queue_push_back(queue *q, void *v) · 7 unmodified lines
133133 q->length++;
134134 }
135135
136−void *queue_pop_front(queue *q)
136+void *ff_queue_pop_front(FFQueue *q)
137137 {
138− queue_entry *front;
139− queue_entry *new_head_next;
138+ FFQueueEntry *front;
139+ FFQueueEntry *new_head_next;
140140 void *ret;
141141
142142 if (!q || q->length == 0)
@@ -154,10 +154,10 @@ void *queue_pop_front(queue *q) · 11 unmodified lines
154154 return ret;
155155 }
156156
157−void *queue_pop_back(queue *q)
157+void *ff_queue_pop_back(FFQueue *q)
158158 {
159− queue_entry *back;
160− queue_entry *new_tail_prev;
159+ FFQueueEntry *back;
160+ FFQueueEntry *new_tail_prev;
161161 void *ret;
162162
163163 if (!q || q->length == 0)
libavfilter/dnn/queue.h+10−10
@@ -22,20 +22,20 @@ · 21 unmodified lines
2222 #ifndef AVFILTER_DNN_QUEUE_H
2323 #define AVFILTER_DNN_QUEUE_H
2424
25−typedef struct _queue queue;
25+typedef struct FFQueue FFQueue;
2626
27−queue *queue_create(void);
28−void queue_destroy(queue *q);
27+FFQueue *ff_queue_create(void);
28+void ff_queue_destroy(FFQueue *q);
2929
30−size_t queue_size(queue *q);
30+size_t ff_queue_size(FFQueue *q);
3131
32−void *queue_peek_front(queue *q);
33−void *queue_peek_back(queue *q);
32+void *ff_queue_peek_front(FFQueue *q);
33+void *ff_queue_peek_back(FFQueue *q);
3434
35−void queue_push_front(queue *q, void *v);
36−void queue_push_back(queue *q, void *v);
35+void ff_queue_push_front(FFQueue *q, void *v);
36+void ff_queue_push_back(FFQueue *q, void *v);
3737
38−void *queue_pop_front(queue *q);
39−void *queue_pop_back(queue *q);
38+void *ff_queue_pop_front(FFQueue *q);
39+void *ff_queue_pop_back(FFQueue *q);
4040
4141 #endif
libavfilter/dnn/safe_queue.c+17−17
@@ -25,19 +25,19 @@ · 24 unmodified lines
2525 #include "libavutil/avassert.h"
2626 #include "libavutil/thread.h"
2727
28−typedef struct _safe_queue {
29− queue *q;
28+struct FFSafeQueue {
29+ FFQueue *q;
3030 pthread_mutex_t mutex;
3131 pthread_cond_t cond;
32−}safe_queue;
32+};
3333
34−safe_queue *safe_queue_create(void)
34+FFSafeQueue *ff_safe_queue_create(void)
3535 {
36− safe_queue *sq = av_malloc(sizeof(*sq));
36+ FFSafeQueue *sq = av_malloc(sizeof(*sq));
3737 if (!sq)
3838 return NULL;
3939
40− sq->q = queue_create();
40+ sq->q = ff_queue_create();
4141 if (!sq->q)
4242 return NULL;
4343
@@ -46,46 +46,46 @@ safe_queue *safe_queue_create(void) · 2 unmodified lines
4646 return sq;
4747 }
4848
49−void safe_queue_destroy(safe_queue *sq)
49+void ff_safe_queue_destroy(FFSafeQueue *sq)
5050 {
5151 if (!sq)
5252 return;
5353
54− queue_destroy(sq->q);
54+ ff_queue_destroy(sq->q);
5555 pthread_mutex_destroy(&sq->mutex);
5656 pthread_cond_destroy(&sq->cond);
5757 av_freep(&sq);
5858 }
5959
60−size_t safe_queue_size(safe_queue *sq)
60+size_t ff_safe_queue_size(FFSafeQueue *sq)
6161 {
62− return sq ? queue_size(sq->q) : 0;
62+ return sq ? ff_queue_size(sq->q) : 0;
6363 }
6464
65−void safe_queue_push_front(safe_queue *sq, void *v)
65+void ff_safe_queue_push_front(FFSafeQueue *sq, void *v)
6666 {
6767 pthread_mutex_lock(&sq->mutex);
68− queue_push_front(sq->q, v);
68+ ff_queue_push_front(sq->q, v);
6969 pthread_cond_signal(&sq->cond);
7070 pthread_mutex_unlock(&sq->mutex);
7171 }
7272
73−void safe_queue_push_back(safe_queue *sq, void *v)
73+void ff_safe_queue_push_back(FFSafeQueue *sq, void *v)
7474 {
7575 pthread_mutex_lock(&sq->mutex);
76− queue_push_back(sq->q, v);
76+ ff_queue_push_back(sq->q, v);
7777 pthread_cond_signal(&sq->cond);
7878 pthread_mutex_unlock(&sq->mutex);
7979 }
8080
81−void *safe_queue_pop_front(safe_queue *sq)
81+void *ff_safe_queue_pop_front(FFSafeQueue *sq)
8282 {
8383 void *value;
8484 pthread_mutex_lock(&sq->mutex);
85− while (queue_size(sq->q) == 0) {
85+ while (ff_queue_size(sq->q) == 0) {
8686 pthread_cond_wait(&sq->cond, &sq->mutex);
8787 }
88− value = queue_pop_front(sq->q);
88+ value = ff_queue_pop_front(sq->q);
8989 pthread_cond_signal(&sq->cond);
9090 pthread_mutex_unlock(&sq->mutex);
9191 return value;
libavfilter/dnn/safe_queue.h+7−7
@@ -21,16 +21,16 @@ · 20 unmodified lines
2121 #ifndef AVFILTER_DNN_SAFE_QUEUE_H
2222 #define AVFILTER_DNN_SAFE_QUEUE_H
2323
24−typedef struct _safe_queue safe_queue;
24+typedef struct FFSafeQueue FFSafeQueue;
2525
26−safe_queue *safe_queue_create(void);
27−void safe_queue_destroy(safe_queue *sq);
26+FFSafeQueue *ff_safe_queue_create(void);
27+void ff_safe_queue_destroy(FFSafeQueue *sq);
2828
29−size_t safe_queue_size(safe_queue *sq);
29+size_t ff_safe_queue_size(FFSafeQueue *sq);
3030
31−void safe_queue_push_front(safe_queue *sq, void *v);
32−void safe_queue_push_back(safe_queue *sq, void *v);
31+void ff_safe_queue_push_front(FFSafeQueue *sq, void *v);
32+void ff_safe_queue_push_back(FFSafeQueue *sq, void *v);
3333
34−void *safe_queue_pop_front(safe_queue *sq);
34+void *ff_safe_queue_pop_front(FFSafeQueue *sq);
3535
3636 #endif

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