RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libavfilter/dnn_io_proc: Take step into consideration when crop frame 

Signed-off-by: Wenbin Chen <wenbin.chen@intel.com>
Reviewed-by: Guo Yejun <yejun.guo@intel.com>
This commit is contained in:
Wenbin Chen 2024-04-02 16:13:06 +08:00 committed by Guo Yejun
parent 8869f5ce86
commit 478d97f303
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/dnn/dnn_io_proc.c
View File

@ -351,6 +351,7 @@ int ff_frame_to_dnn_classify(AVFrame *frame, DNNData *input, uint32_t bbox_index
const AVDetectionBBoxHeader *header; const AVDetectionBBoxHeader *header;
const AVDetectionBBox *bbox; const AVDetectionBBox *bbox;
AVFrameSideData *sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DETECTION_BBOXES); AVFrameSideData *sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DETECTION_BBOXES);
int max_step[4] = { 0 };
av_assert0(sd); av_assert0(sd);
/* (scale != 1 and scale != 0) or mean != 0 */ /* (scale != 1 and scale != 0) or mean != 0 */
@ -406,8 +407,9 @@ int ff_frame_to_dnn_classify(AVFrame *frame, DNNData *input, uint32_t bbox_index
offsety[1] = offsety[2] = AV_CEIL_RSHIFT(top, desc->log2_chroma_h); offsety[1] = offsety[2] = AV_CEIL_RSHIFT(top, desc->log2_chroma_h);
offsety[0] = offsety[3] = top; offsety[0] = offsety[3] = top;
av_image_fill_max_pixsteps(max_step, NULL, desc);
for (int k = 0; frame->data[k]; k++) for (int k = 0; frame->data[k]; k++)
bbox_data[k] = frame->data[k] + offsety[k] * frame->linesize[k] + offsetx[k]; bbox_data[k] = frame->data[k] + offsety[k] * frame->linesize[k] + offsetx[k] * max_step[k];
sws_scale(sws_ctx, (const uint8_t *const *)&bbox_data, frame->linesize, sws_scale(sws_ctx, (const uint8_t *const *)&bbox_data, frame->linesize,
0, height, 0, height,