diff options
Diffstat (limited to 'libavfilter/dnn')
| -rw-r--r-- | libavfilter/dnn/dnn_backend_tf.c | 1 | ||||
| -rw-r--r-- | libavfilter/dnn/dnn_io_proc.c | 14 |
2 files changed, 12 insertions, 3 deletions
diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c index 03fe310b03..45da29ae70 100644 --- a/libavfilter/dnn/dnn_backend_tf.c +++ b/libavfilter/dnn/dnn_backend_tf.c @@ -143,6 +143,7 @@ static DNNReturnType get_input_tf(void *model, DNNData *input, const char *input tf_output.index = 0; input->dt = TF_OperationOutputType(tf_output); + input->order = DCO_RGB; status = TF_NewStatus(); TF_GraphGetTensorShape(tf_model->graph, tf_output, dims, 4, status); diff --git a/libavfilter/dnn/dnn_io_proc.c b/libavfilter/dnn/dnn_io_proc.c index 5f60d68078..1e2bef3f9a 100644 --- a/libavfilter/dnn/dnn_io_proc.c +++ b/libavfilter/dnn/dnn_io_proc.c @@ -168,11 +168,19 @@ static DNNReturnType proc_from_frame_to_dnn_frameprocessing(AVFrame *frame, DNND static enum AVPixelFormat get_pixel_format(DNNData *data) { - if (data->dt == DNN_UINT8 && data->order == DCO_BGR) { - return AV_PIX_FMT_BGR24; + if (data->dt == DNN_UINT8) { + switch (data->order) { + case DCO_BGR: + return AV_PIX_FMT_BGR24; + case DCO_RGB: + return AV_PIX_FMT_RGB24; + default: + av_assert0(!"unsupported data pixel format.\n"); + return AV_PIX_FMT_BGR24; + } } - av_assert0(!"not supported yet.\n"); + av_assert0(!"unsupported data type.\n"); return AV_PIX_FMT_BGR24; } |