[FFmpeg-devel] [v2] dnn_backend_native_layer_mathbinary: add floormod support

[Mingyu Yin]

Signed-off-by: Mingyu Yin <mingyu.yin at intel.com>
---
 .../dnn/dnn_backend_native_layer_mathbinary.c   | 17 +++++++++++++++++
 .../dnn/dnn_backend_native_layer_mathbinary.h   |  1 +
 tests/dnn/dnn-layer-mathbinary-test.c           |  5 +++++
 tools/python/convert_from_tensorflow.py         |  2 +-
 tools/python/convert_header.py                  |  2 +-
 5 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c
index dd42c329a9..6876aaf2c6 100644
--- a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c
+++ b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c
@@ -175,6 +175,23 @@ int dnn_execute_layer_math_binary(DnnOperand *operands, const int32_t *input_ope
             }
         }
         return 0;
+    case DMBO_FLOORMOD:
+        if (params->input0_broadcast) {
+            for (int i = 0; i < dims_count; ++i) {
+                dst[i] = (int)(params->v) % (int)(src[i]);
+            }
+        } else if (params->input1_broadcast) {
+            for (int i = 0; i < dims_count; ++i) {
+                dst[i] = (int)(src[i]) % (int)(params->v);
+            }
+        } else {
+            const DnnOperand *input1 = &operands[input_operand_indexes[1]];
+            const float *src1 = input1->data;
+            for (int i = 0; i < dims_count; ++i) {
+                dst[i] = (int)(src[i]) % (int)(src1[i]);
+            }
+        }
+        return 0;
     default:
         return -1;
     }
diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.h b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.h
index 0acf3b0ea0..9525685afa 100644
--- a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.h
+++ b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.h
@@ -36,6 +36,7 @@ typedef enum {
     DMBO_MUL = 2,
     DMBO_REALDIV = 3,
     DMBO_MINIMUM = 4,
+    DMBO_FLOORMOD = 5,
     DMBO_COUNT
 } DNNMathBinaryOperation;
 
diff --git a/tests/dnn/dnn-layer-mathbinary-test.c b/tests/dnn/dnn-layer-mathbinary-test.c
index e7f8f8557c..e5f6a12939 100644
--- a/tests/dnn/dnn-layer-mathbinary-test.c
+++ b/tests/dnn/dnn-layer-mathbinary-test.c
@@ -40,6 +40,8 @@ static float get_expected(float f1, float f2, DNNMathBinaryOperation op)
         return f1 / f2;
     case DMBO_MINIMUM:
         return (f1 < f2) ? f1 : f2;
+    case DMBO_FLOORMOD:
+        return (int)(f1) % (int)(f2);
     default:
         av_assert0(!"not supported yet");
         return 0.f;
@@ -205,5 +207,8 @@ int main(int argc, char **argv)
     if (test(DMBO_MINIMUM))
         return 1;
 
+    if (test(DMBO_FLOORMOD))
+        return 1;
+
     return 0;
 }
diff --git a/tools/python/convert_from_tensorflow.py b/tools/python/convert_from_tensorflow.py
index 3c14bed487..1762091fdd 100644
--- a/tools/python/convert_from_tensorflow.py
+++ b/tools/python/convert_from_tensorflow.py
@@ -73,7 +73,7 @@ class TFConverter:
         self.conv2d_scopename_inputname_dict = {}
         self.op2code = {'Conv2D':1, 'DepthToSpace':2, 'MirrorPad':3, 'Maximum':4,
                         'MathBinary':5, 'MathUnary':6, 'AvgPool':7}
-        self.mathbin2code = {'Sub':0, 'Add':1, 'Mul':2, 'RealDiv':3, 'Minimum':4}
+        self.mathbin2code = {'Sub':0, 'Add':1, 'Mul':2, 'RealDiv':3, 'Minimum':4, 'FloorMod':5}
         self.mathun2code  = {'Abs':0, 'Sin':1, 'Cos':2, 'Tan':3, 'Asin':4,
                 'Acos':5, 'Atan':6, 'Sinh':7, 'Cosh':8, 'Tanh':9, 'Asinh':10,
                 'Acosh':11, 'Atanh':12, 'Ceil':13, 'Floor':14, 'Round':15}
diff --git a/tools/python/convert_header.py b/tools/python/convert_header.py
index 747c8776eb..782a6341f9 100644
--- a/tools/python/convert_header.py
+++ b/tools/python/convert_header.py
@@ -23,4 +23,4 @@ str = 'FFMPEGDNNNATIVE'
 major = 1
 
 # increase minor when we don't have to re-convert the model file
-minor = 21
+minor = 22
-- 
2.17.1