The prefix for symbols not exported from the library and not local to one translation unit is ff_ (or FF for types).
Showing the changes to libavfilter (5 of 5 files). Show all
Unified · Split
| @@ -53,8 +53,8 @@ typedef struct OVModel{ · 52 unmodified lines | |||
| 53 | ie_infer_request_t *infer_request; | 53 | ie_infer_request_t *infer_request; |
| 54 | 54 | ||
| 55 | /* for async execution */ | 55 | /* for async execution */ |
| 56 | safe_queue *request_queue; // holds RequestItem | 56 | FFSafeQueue *request_queue; // holds RequestItem |
| 57 | queue *task_queue; // holds TaskItem | 57 | FFQueue *task_queue; // holds TaskItem |
| 58 | } OVModel; | 58 | } OVModel; |
| 59 | 59 | ||
| 60 | typedef struct TaskItem { | 60 | typedef struct TaskItem { |
| @@ -208,7 +208,7 @@ static void infer_completion_callback(void *args) · 147 unmodified lines | |||
| 208 | 208 | ||
| 209 | if (task->async) { | 209 | if (task->async) { |
| 210 | request->task = NULL; | 210 | 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); |
| 212 | } | 212 | } |
| 213 | 213 | ||
| 214 | task->done = 1; | 214 | task->done = 1; |
| @@ -417,7 +417,7 @@ DNNModel *ff_dnn_load_model_ov(const char *model_filename, const char *options, · 202 unmodified lines | |||
| 417 | ctx->options.nireq = av_cpu_count() / 2 + 1; | 417 | ctx->options.nireq = av_cpu_count() / 2 + 1; |
| 418 | } | 418 | } |
| 419 | 419 | ||
| 420 | ov_model->request_queue = safe_queue_create(); | 420 | ov_model->request_queue = ff_safe_queue_create(); |
| 421 | if (!ov_model->request_queue) { | 421 | if (!ov_model->request_queue) { |
| 422 | goto err; | 422 | goto err; |
| 423 | } | 423 | } |
| @@ -436,10 +436,10 @@ DNNModel *ff_dnn_load_model_ov(const char *model_filename, const char *options, · 12 unmodified lines | |||
| 436 | item->infer_request = request; | 436 | item->infer_request = request; |
| 437 | item->callback.completeCallBackFunc = infer_completion_callback; | 437 | item->callback.completeCallBackFunc = infer_completion_callback; |
| 438 | item->callback.args = item; | 438 | 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); |
| 440 | } | 440 | } |
| 441 | 441 | ||
| 442 | ov_model->task_queue = queue_create(); | 442 | ov_model->task_queue = ff_queue_create(); |
| 443 | if (!ov_model->task_queue) { | 443 | if (!ov_model->task_queue) { |
| 444 | goto err; | 444 | goto err; |
| 445 | } | 445 | } |
| @@ -527,9 +527,9 @@ DNNReturnType ff_dnn_execute_model_async_ov(const DNNModel *model, const char *i · 81 unmodified lines | |||
| 527 | task->output_name = output_names[0]; | 527 | task->output_name = output_names[0]; |
| 528 | task->out_frame = out_frame; | 528 | task->out_frame = out_frame; |
| 529 | task->ov_model = ov_model; | 529 | task->ov_model = ov_model; |
| 530 | queue_push_back(ov_model->task_queue, task); | 530 | ff_queue_push_back(ov_model->task_queue, task); |
| 531 | 531 | ||
| 532 | request = safe_queue_pop_front(ov_model->request_queue); | 532 | request = ff_safe_queue_pop_front(ov_model->request_queue); |
| 533 | if (!request) { | 533 | if (!request) { |
| 534 | av_log(ctx, AV_LOG_ERROR, "unable to get infer request.\n"); | 534 | av_log(ctx, AV_LOG_ERROR, "unable to get infer request.\n"); |
| 535 | return DNN_ERROR; | 535 | return DNN_ERROR; |
| @@ -541,7 +541,7 @@ DNNReturnType ff_dnn_execute_model_async_ov(const DNNModel *model, const char *i · 5 unmodified lines | |||
| 541 | DNNAsyncStatusType ff_dnn_get_async_result_ov(const DNNModel *model, AVFrame **in, AVFrame **out) | 541 | DNNAsyncStatusType ff_dnn_get_async_result_ov(const DNNModel *model, AVFrame **in, AVFrame **out) |
| 542 | { | 542 | { |
| 543 | OVModel *ov_model = (OVModel *)model->model; | 543 | 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); |
| 545 | 545 | ||
| 546 | if (!task) { | 546 | if (!task) { |
| 547 | return DAST_EMPTY_QUEUE; | 547 | return DAST_EMPTY_QUEUE; |
| @@ -553,7 +553,7 @@ DNNAsyncStatusType ff_dnn_get_async_result_ov(const DNNModel *model, AVFrame **i · 5 unmodified lines | |||
| 553 | 553 | ||
| 554 | *in = task->in_frame; | 554 | *in = task->in_frame; |
| 555 | *out = task->out_frame; | 555 | *out = task->out_frame; |
| 556 | queue_pop_front(ov_model->task_queue); | 556 | ff_queue_pop_front(ov_model->task_queue); |
| 557 | av_freep(&task); | 557 | av_freep(&task); |
| 558 | 558 | ||
| 559 | return DAST_SUCCESS; | 559 | return DAST_SUCCESS; |
| @@ -563,20 +563,20 @@ void ff_dnn_free_model_ov(DNNModel **model) · 3 unmodified lines | |||
| 563 | { | 563 | { |
| 564 | if (*model){ | 564 | if (*model){ |
| 565 | OVModel *ov_model = (OVModel *)(*model)->model; | 565 | OVModel *ov_model = (OVModel *)(*model)->model; |
| 566 | while (safe_queue_size(ov_model->request_queue) != 0) { | 566 | while (ff_safe_queue_size(ov_model->request_queue) != 0) { |
| 567 | RequestItem *item = safe_queue_pop_front(ov_model->request_queue); | 567 | RequestItem *item = ff_safe_queue_pop_front(ov_model->request_queue); |
| 568 | if (item && item->infer_request) { | 568 | if (item && item->infer_request) { |
| 569 | ie_infer_request_free(&item->infer_request); | 569 | ie_infer_request_free(&item->infer_request); |
| 570 | } | 570 | } |
| 571 | av_freep(&item); | 571 | av_freep(&item); |
| 572 | } | 572 | } |
| 573 | safe_queue_destroy(ov_model->request_queue); | 573 | ff_safe_queue_destroy(ov_model->request_queue); |
| 574 | 574 | ||
| 575 | while (queue_size(ov_model->task_queue) != 0) { | 575 | while (ff_queue_size(ov_model->task_queue) != 0) { |
| 576 | TaskItem *item = queue_pop_front(ov_model->task_queue); | 576 | TaskItem *item = ff_queue_pop_front(ov_model->task_queue); |
| 577 | av_freep(&item); | 577 | av_freep(&item); |
| 578 | } | 578 | } |
| 579 | queue_destroy(ov_model->task_queue); | 579 | ff_queue_destroy(ov_model->task_queue); |
| 580 | 580 | ||
| 581 | if (ov_model->infer_request) | 581 | if (ov_model->infer_request) |
| 582 | ie_infer_request_free(&ov_model->infer_request); | 582 | ie_infer_request_free(&ov_model->infer_request); |
| @@ -23,31 +23,31 @@ · 22 unmodified lines | |||
| 23 | #include "libavutil/mem.h" | 23 | #include "libavutil/mem.h" |
| 24 | #include "libavutil/avassert.h" | 24 | #include "libavutil/avassert.h" |
| 25 | 25 | ||
| 26 | typedef struct _queue_entry queue_entry; | 26 | typedef struct FFQueueEntry FFQueueEntry; |
| 27 | 27 | ||
| 28 | typedef struct _queue { | 28 | struct FFQueueEntry { |
| 29 | queue_entry *head; | ||
| 30 | queue_entry *tail; | ||
| 31 | size_t length; | ||
| 32 | }queue; | ||
| 33 | |||
| 34 | typedef struct _queue_entry { | ||
| 35 | void *value; | 29 | void *value; |
| 36 | queue_entry *prev; | 30 | FFQueueEntry *prev; |
| 37 | queue_entry *next; | 31 | FFQueueEntry *next; |
| 38 | } queue_entry; | 32 | }; |
| 33 | |||
| 34 | struct FFQueue { | ||
| 35 | FFQueueEntry *head; | ||
| 36 | FFQueueEntry *tail; | ||
| 37 | size_t length; | ||
| 38 | }; | ||
| 39 | 39 | ||
| 40 | static inline queue_entry *create_entry(void *val) | 40 | static inline FFQueueEntry *create_entry(void *val) |
| 41 | { | 41 | { |
| 42 | queue_entry *entry = av_malloc(sizeof(*entry)); | 42 | FFQueueEntry *entry = av_malloc(sizeof(*entry)); |
| 43 | av_assert0(entry != NULL); | 43 | av_assert0(entry != NULL); |
| 44 | entry->value = val; | 44 | entry->value = val; |
| 45 | return entry; | 45 | return entry; |
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | queue* queue_create(void) | 48 | FFQueue* ff_queue_create(void) |
| 49 | { | 49 | { |
| 50 | queue *q = av_malloc(sizeof(*q)); | 50 | FFQueue *q = av_malloc(sizeof(*q)); |
| 51 | if (!q) | 51 | if (!q) |
| 52 | return NULL; | 52 | return NULL; |
| 53 | 53 | ||
| @@ -62,15 +62,15 @@ queue* queue_create(void) · 8 unmodified lines | |||
| 62 | return q; | 62 | return q; |
| 63 | } | 63 | } |
| 64 | 64 | ||
| 65 | void queue_destroy(queue *q) | 65 | void ff_queue_destroy(FFQueue *q) |
| 66 | { | 66 | { |
| 67 | queue_entry *entry; | 67 | FFQueueEntry *entry; |
| 68 | if (!q) | 68 | if (!q) |
| 69 | return; | 69 | return; |
| 70 | 70 | ||
| 71 | entry = q->head; | 71 | entry = q->head; |
| 72 | while (entry != NULL) { | 72 | while (entry != NULL) { |
| 73 | queue_entry *temp = entry; | 73 | FFQueueEntry *temp = entry; |
| 74 | entry = entry->next; | 74 | entry = entry->next; |
| 75 | av_freep(&temp); | 75 | av_freep(&temp); |
| 76 | } | 76 | } |
| @@ -78,12 +78,12 @@ void queue_destroy(queue *q) · 1 unmodified line | |||
| 78 | av_freep(&q); | 78 | av_freep(&q); |
| 79 | } | 79 | } |
| 80 | 80 | ||
| 81 | size_t queue_size(queue *q) | 81 | size_t ff_queue_size(FFQueue *q) |
| 82 | { | 82 | { |
| 83 | return q ? q->length : 0; | 83 | return q ? q->length : 0; |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | void *queue_peek_front(queue *q) | 86 | void *ff_queue_peek_front(FFQueue *q) |
| 87 | { | 87 | { |
| 88 | if (!q || q->length == 0) | 88 | if (!q || q->length == 0) |
| 89 | return NULL; | 89 | return NULL; |
| @@ -91,7 +91,7 @@ void *queue_peek_front(queue *q) · 1 unmodified line | |||
| 91 | return q->head->next->value; | 91 | return q->head->next->value; |
| 92 | } | 92 | } |
| 93 | 93 | ||
| 94 | void *queue_peek_back(queue *q) | 94 | void *ff_queue_peek_back(FFQueue *q) |
| 95 | { | 95 | { |
| 96 | if (!q || q->length == 0) | 96 | if (!q || q->length == 0) |
| 97 | return NULL; | 97 | return NULL; |
| @@ -99,10 +99,10 @@ void *queue_peek_back(queue *q) · 1 unmodified line | |||
| 99 | return q->tail->prev->value; | 99 | return q->tail->prev->value; |
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | void queue_push_front(queue *q, void *v) | 102 | void ff_queue_push_front(FFQueue *q, void *v) |
| 103 | { | 103 | { |
| 104 | queue_entry *new_entry; | 104 | FFQueueEntry *new_entry; |
| 105 | queue_entry *original_next; | 105 | FFQueueEntry *original_next; |
| 106 | if (!q) | 106 | if (!q) |
| 107 | return; | 107 | return; |
| 108 | 108 | ||
| @@ -116,10 +116,10 @@ void queue_push_front(queue *q, void *v) · 7 unmodified lines | |||
| 116 | q->length++; | 116 | q->length++; |
| 117 | } | 117 | } |
| 118 | 118 | ||
| 119 | void queue_push_back(queue *q, void *v) | 119 | void ff_queue_push_back(FFQueue *q, void *v) |
| 120 | { | 120 | { |
| 121 | queue_entry *new_entry; | 121 | FFQueueEntry *new_entry; |
| 122 | queue_entry *original_prev; | 122 | FFQueueEntry *original_prev; |
| 123 | if (!q) | 123 | if (!q) |
| 124 | return; | 124 | return; |
| 125 | 125 | ||
| @@ -133,10 +133,10 @@ void queue_push_back(queue *q, void *v) · 7 unmodified lines | |||
| 133 | q->length++; | 133 | q->length++; |
| 134 | } | 134 | } |
| 135 | 135 | ||
| 136 | void *queue_pop_front(queue *q) | 136 | void *ff_queue_pop_front(FFQueue *q) |
| 137 | { | 137 | { |
| 138 | queue_entry *front; | 138 | FFQueueEntry *front; |
| 139 | queue_entry *new_head_next; | 139 | FFQueueEntry *new_head_next; |
| 140 | void *ret; | 140 | void *ret; |
| 141 | 141 | ||
| 142 | if (!q || q->length == 0) | 142 | if (!q || q->length == 0) |
| @@ -154,10 +154,10 @@ void *queue_pop_front(queue *q) · 11 unmodified lines | |||
| 154 | return ret; | 154 | return ret; |
| 155 | } | 155 | } |
| 156 | 156 | ||
| 157 | void *queue_pop_back(queue *q) | 157 | void *ff_queue_pop_back(FFQueue *q) |
| 158 | { | 158 | { |
| 159 | queue_entry *back; | 159 | FFQueueEntry *back; |
| 160 | queue_entry *new_tail_prev; | 160 | FFQueueEntry *new_tail_prev; |
| 161 | void *ret; | 161 | void *ret; |
| 162 | 162 | ||
| 163 | if (!q || q->length == 0) | 163 | if (!q || q->length == 0) |
| @@ -22,20 +22,20 @@ · 21 unmodified lines | |||
| 22 | #ifndef AVFILTER_DNN_QUEUE_H | 22 | #ifndef AVFILTER_DNN_QUEUE_H |
| 23 | #define AVFILTER_DNN_QUEUE_H | 23 | #define AVFILTER_DNN_QUEUE_H |
| 24 | 24 | ||
| 25 | typedef struct _queue queue; | 25 | typedef struct FFQueue FFQueue; |
| 26 | 26 | ||
| 27 | queue *queue_create(void); | 27 | FFQueue *ff_queue_create(void); |
| 28 | void queue_destroy(queue *q); | 28 | void ff_queue_destroy(FFQueue *q); |
| 29 | 29 | ||
| 30 | size_t queue_size(queue *q); | 30 | size_t ff_queue_size(FFQueue *q); |
| 31 | 31 | ||
| 32 | void *queue_peek_front(queue *q); | 32 | void *ff_queue_peek_front(FFQueue *q); |
| 33 | void *queue_peek_back(queue *q); | 33 | void *ff_queue_peek_back(FFQueue *q); |
| 34 | 34 | ||
| 35 | void queue_push_front(queue *q, void *v); | 35 | void ff_queue_push_front(FFQueue *q, void *v); |
| 36 | void queue_push_back(queue *q, void *v); | 36 | void ff_queue_push_back(FFQueue *q, void *v); |
| 37 | 37 | ||
| 38 | void *queue_pop_front(queue *q); | 38 | void *ff_queue_pop_front(FFQueue *q); |
| 39 | void *queue_pop_back(queue *q); | 39 | void *ff_queue_pop_back(FFQueue *q); |
| 40 | 40 | ||
| 41 | #endif | 41 | #endif |
| @@ -25,19 +25,19 @@ · 24 unmodified lines | |||
| 25 | #include "libavutil/avassert.h" | 25 | #include "libavutil/avassert.h" |
| 26 | #include "libavutil/thread.h" | 26 | #include "libavutil/thread.h" |
| 27 | 27 | ||
| 28 | typedef struct _safe_queue { | 28 | struct FFSafeQueue { |
| 29 | queue *q; | 29 | FFQueue *q; |
| 30 | pthread_mutex_t mutex; | 30 | pthread_mutex_t mutex; |
| 31 | pthread_cond_t cond; | 31 | pthread_cond_t cond; |
| 32 | }safe_queue; | 32 | }; |
| 33 | 33 | ||
| 34 | safe_queue *safe_queue_create(void) | 34 | FFSafeQueue *ff_safe_queue_create(void) |
| 35 | { | 35 | { |
| 36 | safe_queue *sq = av_malloc(sizeof(*sq)); | 36 | FFSafeQueue *sq = av_malloc(sizeof(*sq)); |
| 37 | if (!sq) | 37 | if (!sq) |
| 38 | return NULL; | 38 | return NULL; |
| 39 | 39 | ||
| 40 | sq->q = queue_create(); | 40 | sq->q = ff_queue_create(); |
| 41 | if (!sq->q) | 41 | if (!sq->q) |
| 42 | return NULL; | 42 | return NULL; |
| 43 | 43 | ||
| @@ -46,46 +46,46 @@ safe_queue *safe_queue_create(void) · 2 unmodified lines | |||
| 46 | return sq; | 46 | return sq; |
| 47 | } | 47 | } |
| 48 | 48 | ||
| 49 | void safe_queue_destroy(safe_queue *sq) | 49 | void ff_safe_queue_destroy(FFSafeQueue *sq) |
| 50 | { | 50 | { |
| 51 | if (!sq) | 51 | if (!sq) |
| 52 | return; | 52 | return; |
| 53 | 53 | ||
| 54 | queue_destroy(sq->q); | 54 | ff_queue_destroy(sq->q); |
| 55 | pthread_mutex_destroy(&sq->mutex); | 55 | pthread_mutex_destroy(&sq->mutex); |
| 56 | pthread_cond_destroy(&sq->cond); | 56 | pthread_cond_destroy(&sq->cond); |
| 57 | av_freep(&sq); | 57 | av_freep(&sq); |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | size_t safe_queue_size(safe_queue *sq) | 60 | size_t ff_safe_queue_size(FFSafeQueue *sq) |
| 61 | { | 61 | { |
| 62 | return sq ? queue_size(sq->q) : 0; | 62 | return sq ? ff_queue_size(sq->q) : 0; |
| 63 | } | 63 | } |
| 64 | 64 | ||
| 65 | void safe_queue_push_front(safe_queue *sq, void *v) | 65 | void ff_safe_queue_push_front(FFSafeQueue *sq, void *v) |
| 66 | { | 66 | { |
| 67 | pthread_mutex_lock(&sq->mutex); | 67 | pthread_mutex_lock(&sq->mutex); |
| 68 | queue_push_front(sq->q, v); | 68 | ff_queue_push_front(sq->q, v); |
| 69 | pthread_cond_signal(&sq->cond); | 69 | pthread_cond_signal(&sq->cond); |
| 70 | pthread_mutex_unlock(&sq->mutex); | 70 | pthread_mutex_unlock(&sq->mutex); |
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | void safe_queue_push_back(safe_queue *sq, void *v) | 73 | void ff_safe_queue_push_back(FFSafeQueue *sq, void *v) |
| 74 | { | 74 | { |
| 75 | pthread_mutex_lock(&sq->mutex); | 75 | pthread_mutex_lock(&sq->mutex); |
| 76 | queue_push_back(sq->q, v); | 76 | ff_queue_push_back(sq->q, v); |
| 77 | pthread_cond_signal(&sq->cond); | 77 | pthread_cond_signal(&sq->cond); |
| 78 | pthread_mutex_unlock(&sq->mutex); | 78 | pthread_mutex_unlock(&sq->mutex); |
| 79 | } | 79 | } |
| 80 | 80 | ||
| 81 | void *safe_queue_pop_front(safe_queue *sq) | 81 | void *ff_safe_queue_pop_front(FFSafeQueue *sq) |
| 82 | { | 82 | { |
| 83 | void *value; | 83 | void *value; |
| 84 | pthread_mutex_lock(&sq->mutex); | 84 | pthread_mutex_lock(&sq->mutex); |
| 85 | while (queue_size(sq->q) == 0) { | 85 | while (ff_queue_size(sq->q) == 0) { |
| 86 | pthread_cond_wait(&sq->cond, &sq->mutex); | 86 | pthread_cond_wait(&sq->cond, &sq->mutex); |
| 87 | } | 87 | } |
| 88 | value = queue_pop_front(sq->q); | 88 | value = ff_queue_pop_front(sq->q); |
| 89 | pthread_cond_signal(&sq->cond); | 89 | pthread_cond_signal(&sq->cond); |
| 90 | pthread_mutex_unlock(&sq->mutex); | 90 | pthread_mutex_unlock(&sq->mutex); |
| 91 | return value; | 91 | return value; |
| @@ -21,16 +21,16 @@ · 20 unmodified lines | |||
| 21 | #ifndef AVFILTER_DNN_SAFE_QUEUE_H | 21 | #ifndef AVFILTER_DNN_SAFE_QUEUE_H |
| 22 | #define AVFILTER_DNN_SAFE_QUEUE_H | 22 | #define AVFILTER_DNN_SAFE_QUEUE_H |
| 23 | 23 | ||
| 24 | typedef struct _safe_queue safe_queue; | 24 | typedef struct FFSafeQueue FFSafeQueue; |
| 25 | 25 | ||
| 26 | safe_queue *safe_queue_create(void); | 26 | FFSafeQueue *ff_safe_queue_create(void); |
| 27 | void safe_queue_destroy(safe_queue *sq); | 27 | void ff_safe_queue_destroy(FFSafeQueue *sq); |
| 28 | 28 | ||
| 29 | size_t safe_queue_size(safe_queue *sq); | 29 | size_t ff_safe_queue_size(FFSafeQueue *sq); |
| 30 | 30 | ||
| 31 | void safe_queue_push_front(safe_queue *sq, void *v); | 31 | void ff_safe_queue_push_front(FFSafeQueue *sq, void *v); |
| 32 | void safe_queue_push_back(safe_queue *sq, void *v); | 32 | void ff_safe_queue_push_back(FFSafeQueue *sq, void *v); |
| 33 | 33 | ||
| 34 | void *safe_queue_pop_front(safe_queue *sq); | 34 | void *ff_safe_queue_pop_front(FFSafeQueue *sq); |
| 35 | 35 | ||
| 36 | #endif | 36 | #endif |