You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-10 06:10:52 +02:00
avfilter/vf_dnn_detect: fix loading anchors when labels file is set
References https://trac.ffmpeg.org/ticket/11387 Defining anchors is needed, even when a filename with the labels is set. The issue was identified when using yolov4-tiny model using openvino. More information about how to reproduce the bug can be found on the trac issue referenced by this commit. Signed-off-by: Leandro Santiago <leandrosansilva@gmail.com>
This commit is contained in:
committed by
Guo Yejun
parent
07e54f9b5c
commit
9d9ac8e2ca
@@ -695,8 +695,12 @@ static av_cold int dnn_detect_init(AVFilterContext *context)
|
|||||||
ff_dnn_set_detect_post_proc(&ctx->dnnctx, dnn_detect_post_proc);
|
ff_dnn_set_detect_post_proc(&ctx->dnnctx, dnn_detect_post_proc);
|
||||||
|
|
||||||
if (ctx->labels_filename) {
|
if (ctx->labels_filename) {
|
||||||
return read_detect_label_file(context);
|
ret = read_detect_label_file(context);
|
||||||
|
if (ret) {
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ctx->anchors_str) {
|
if (ctx->anchors_str) {
|
||||||
ret = dnn_detect_parse_anchors(ctx->anchors_str, &ctx->anchors);
|
ret = dnn_detect_parse_anchors(ctx->anchors_str, &ctx->anchors);
|
||||||
if (!ctx->anchors) {
|
if (!ctx->anchors) {
|
||||||
@@ -705,6 +709,7 @@ static av_cold int dnn_detect_init(AVFilterContext *context)
|
|||||||
}
|
}
|
||||||
ctx->nb_anchor = ret;
|
ctx->nb_anchor = ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user