virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avfilter/dnn: do not manually parse anchors filter option

Browse Source 
Instead, rely on AV_OPT_TYPE_FLAG_ARRAY, which will automatically
perform the parsing.

Signed-off-by: Leandro Santiago <leandrosansilva@gmail.com>
Reviewed-by: Wenbin Chen <wenbin.chen@intel.com>
Reviewed-by: Guo Yejun <yejun.guo@intel.com>
This commit is contained in:
Leandro Santiago
2025-02-26 14:57:32 +01:00
committed by Guo Yejun
parent 5c5be37daf
commit 90fbb40da5
1 changed files with 4 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
libavfilter/vf_dnn_detect.c
View File

@ -31,6 +31,7 @@
#include "libavutil/avstring.h"
#include "libavutil/detection_bbox.h"
#include "libavutil/fifo.h"
#include <float.h>
typedef enum {
DDMT_SSD,
@ -53,11 +54,12 @@ typedef struct DnnDetectContext {
AVFifo *bboxes_fifo;
int scale_width;
int scale_height;
char *anchors_str;
float *anchors;
int nb_anchor;
} DnnDetectContext;
static const AVOptionArrayDef anchor_array_def = { .sep = '&' };
#define OFFSET(x) offsetof(DnnDetectContext, dnnctx.x)
#define OFFSET2(x) offsetof(DnnDetectContext, x)
#define FLAGS AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_VIDEO_PARAM
@ -79,7 +81,7 @@ static const AVOption dnn_detect_options[] = {
{ "cell_w", "cell width", OFFSET2(cell_w), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INTMAX_MAX, FLAGS },
{ "cell_h", "cell height", OFFSET2(cell_h), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INTMAX_MAX, FLAGS },
{ "nb_classes", "The number of class", OFFSET2(nb_classes), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INTMAX_MAX, FLAGS },
{ "anchors", "anchors, splited by '&'", OFFSET2(anchors_str), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, FLAGS },
{ "anchors", "anchors, splited by '&'", OFFSET2(anchors), AV_OPT_TYPE_FLOAT | AV_OPT_TYPE_FLAG_ARRAY, { .arr = &anchor_array_def }, FLT_MIN, FLT_MAX, FLAGS },
{ NULL }
};
@ -106,34 +108,6 @@ static int dnn_detect_get_label_id(int nb_classes, int cell_size, float *label_d
return label_id;
}
static int dnn_detect_parse_anchors(char *anchors_str, float **anchors)
{
char *saveptr = NULL, *token;
float *anchors_buf;
int nb_anchor = 0, i = 0;
while(anchors_str[i] != '\0') {
if(anchors_str[i] == '&')
nb_anchor++;
i++;
}
nb_anchor++;
anchors_buf = av_mallocz(nb_anchor * sizeof(**anchors));
if (!anchors_buf) {
return 0;
}
for (int i = 0; i < nb_anchor; i++) {
token = av_strtok(anchors_str, "&", &saveptr);
if (!token) {
av_freep(&anchors_buf);
return 0;
}
anchors_buf[i] = strtof(token, NULL);
anchors_str = NULL;
}
*anchors = anchors_buf;
return nb_anchor;
}
/* Calculate Intersection Over Union */
static float dnn_detect_IOU(AVDetectionBBox *bbox1, AVDetectionBBox *bbox2)
{
@ -701,15 +675,6 @@ static av_cold int dnn_detect_init(AVFilterContext *context)
}
}
if (ctx->anchors_str) {
ret = dnn_detect_parse_anchors(ctx->anchors_str, &ctx->anchors);
if (!ctx->anchors) {
av_log(context, AV_LOG_ERROR, "failed to parse anchors_str\n");
return AVERROR(EINVAL);
}
ctx->nb_anchor = ret;
}
return 0;
}