History

lavfi/dnn_processing: refine code to use function av_image_copy_plane for data copy

Guo, Yejun committed 6 years ago

Commit 4e1ae431 parent 95ade711 file · +24 −61Browse files

Unified · Split

libavfilter/vf_dnn_processing.c+24−61
@@ -27,6 +27,7 @@ · 26 unmodified lines
2727 #include "libavutil/opt.h"
2828 #include "libavutil/pixdesc.h"
2929 #include "libavutil/avassert.h"
30+#include "libavutil/imgutils.h"
3031 #include "avfilter.h"
3132 #include "dnn_interface.h"
3233 #include "formats.h"
@@ -231,6 +232,8 @@ static int config_output(AVFilterLink *outlink) · 198 unmodified lines
231232
232233 static int copy_from_frame_to_dnn(DNNData *dnn_input, const AVFrame *frame)
233234 {
235+ int bytewidth = av_image_get_linesize(frame->format, frame->width, 0);
236+
234237 switch (frame->format) {
235238 case AV_PIX_FMT_RGB24:
236239 case AV_PIX_FMT_BGR24:
@@ -244,42 +247,17 @@ static int copy_from_frame_to_dnn(DNNData *dnn_input, const AVFrame *frame) · 7 unmodified lines
244247 }
245248 }
246249 } else {
247− uint8_t *dnn_input_data = dnn_input->data;
248250 av_assert0(dnn_input->dt == DNN_UINT8);
249− for (int i = 0; i < frame->height; i++) {
250− for(int j = 0; j < frame->width * 3; j++) {
251− int k = i * frame->linesize[0] + j;
252− int t = i * frame->width * 3 + j;
253− dnn_input_data[t] = frame->data[0][k];
254− }
255− }
251+ av_image_copy_plane(dnn_input->data, bytewidth,
252+ frame->data[0], frame->linesize[0],
253+ bytewidth, frame->height);
256254 }
257255 return 0;
258256 case AV_PIX_FMT_GRAY8:
259− {
260− uint8_t *dnn_input_data = dnn_input->data;
261− av_assert0(dnn_input->dt == DNN_UINT8);
262− for (int i = 0; i < frame->height; i++) {
263− for(int j = 0; j < frame->width; j++) {
264− int k = i * frame->linesize[0] + j;
265− int t = i * frame->width + j;
266− dnn_input_data[t] = frame->data[0][k];
267− }
268− }
269− }
270− return 0;
271257 case AV_PIX_FMT_GRAYF32:
272− {
273− float *dnn_input_data = dnn_input->data;
274− av_assert0(dnn_input->dt == DNN_FLOAT);
275− for (int i = 0; i < frame->height; i++) {
276− for(int j = 0; j < frame->width; j++) {
277− int k = i * frame->linesize[0] + j * sizeof(float);
278− int t = i * frame->width + j;
279− dnn_input_data[t] = *(float*)(frame->data[0] + k);
280− }
281− }
282− }
258+ av_image_copy_plane(dnn_input->data, bytewidth,
259+ frame->data[0], frame->linesize[0],
260+ bytewidth, frame->height);
283261 return 0;
284262 default:
285263 return AVERROR(EIO);
@@ -290,6 +268,8 @@ static int copy_from_frame_to_dnn(DNNData *dnn_input, const AVFrame *frame) · 4 unmodified lines
290268
291269 static int copy_from_dnn_to_frame(AVFrame *frame, const DNNData *dnn_output)
292270 {
271+ int bytewidth = av_image_get_linesize(frame->format, frame->width, 0);
272+
293273 switch (frame->format) {
294274 case AV_PIX_FMT_RGB24:
295275 case AV_PIX_FMT_BGR24:
@@ -303,42 +283,25 @@ static int copy_from_dnn_to_frame(AVFrame *frame, const DNNData *dnn_output) · 7 unmodified lines
303283 }
304284 }
305285 } else {
306− uint8_t *dnn_output_data = dnn_output->data;
307286 av_assert0(dnn_output->dt == DNN_UINT8);
308− for (int i = 0; i < frame->height; i++) {
309− for(int j = 0; j < frame->width * 3; j++) {
310− int k = i * frame->linesize[0] + j;
311− int t = i * frame->width * 3 + j;
312− frame->data[0][k] = dnn_output_data[t];
313− }
314− }
287+ av_image_copy_plane(frame->data[0], frame->linesize[0],
288+ dnn_output->data, bytewidth,
289+ bytewidth, frame->height);
315290 }
316291 return 0;
317292 case AV_PIX_FMT_GRAY8:
318− {
319− uint8_t *dnn_output_data = dnn_output->data;
320− av_assert0(dnn_output->dt == DNN_UINT8);
321− for (int i = 0; i < frame->height; i++) {
322− for(int j = 0; j < frame->width; j++) {
323− int k = i * frame->linesize[0] + j;
324− int t = i * frame->width + j;
325− frame->data[0][k] = dnn_output_data[t];
326− }
327− }
328− }
293+ // it is possible that data type of dnn output is float32,
294+ // need to add support for such case when needed.
295+ av_assert0(dnn_output->dt == DNN_UINT8);
296+ av_image_copy_plane(frame->data[0], frame->linesize[0],
297+ dnn_output->data, bytewidth,
298+ bytewidth, frame->height);
329299 return 0;
330300 case AV_PIX_FMT_GRAYF32:
331− {
332− float *dnn_output_data = dnn_output->data;
333− av_assert0(dnn_output->dt == DNN_FLOAT);
334− for (int i = 0; i < frame->height; i++) {
335− for(int j = 0; j < frame->width; j++) {
336− int k = i * frame->linesize[0] + j * sizeof(float);
337− int t = i * frame->width + j;
338− *(float*)(frame->data[0] + k) = dnn_output_data[t];
339− }
340− }
341− }
301+ av_assert0(dnn_output->dt == DNN_FLOAT);
302+ av_image_copy_plane(frame->data[0], frame->linesize[0],
303+ dnn_output->data, bytewidth,
304+ bytewidth, frame->height);
342305 return 0;
343306 default:
344307 return AVERROR(EIO);

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