[PATCH v4] venus: venc: Fix enum frameintervals

[Stanimir Varbanov]

This fixes an issue when setting the encoder framerate because of
missing precision. Now the frameinterval type is changed to
TYPE_CONTINUOUS and step = 1. Also the math is changed when
framerate property is called - the firmware side expects the
framerate in Q16 values.

Signed-off-by: Stanimir Varbanov <stanimir.varba...@linaro.org>
---

Changes since v3:
Keep min/max numerator one, and divide frate(max/min) to frame
factor (returned framerate max/min capabilities are in range
1 to 120fps but in Q16 i.e. 65536 to 7864320).

 drivers/media/platform/qcom/venus/venc.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/drivers/media/platform/qcom/venus/venc.c 
b/drivers/media/platform/qcom/venus/venc.c
index 1b7fb2d5887c..133ff7eceb83 100644
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -22,6 +22,7 @@
 #include "venc.h"
 
 #define NUM_B_FRAMES_MAX       4
+#define FRAMERATE_FACTOR       BIT(16)
 
 /*
  * Three resons to keep MPLANE formats (despite that the number of planes
@@ -576,7 +577,7 @@ static int venc_enum_frameintervals(struct file *file, void 
*fh,
        struct venus_inst *inst = to_inst(file);
        const struct venus_format *fmt;
 
-       fival->type = V4L2_FRMIVAL_TYPE_STEPWISE;
+       fival->type = V4L2_FRMIVAL_TYPE_CONTINUOUS;
 
        fmt = find_format(inst, fival->pixel_format,
                          V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);
@@ -600,11 +601,11 @@ static int venc_enum_frameintervals(struct file *file, 
void *fh,
                return -EINVAL;
 
        fival->stepwise.min.numerator = 1;
-       fival->stepwise.min.denominator = frate_max(inst);
+       fival->stepwise.min.denominator = frate_max(inst) / FRAMERATE_FACTOR;
        fival->stepwise.max.numerator = 1;
-       fival->stepwise.max.denominator = frate_min(inst);
+       fival->stepwise.max.denominator = frate_min(inst) / FRAMERATE_FACTOR;
        fival->stepwise.step.numerator = 1;
-       fival->stepwise.step.denominator = frate_max(inst);
+       fival->stepwise.step.denominator = 1;
 
        return 0;
 }
@@ -649,6 +650,7 @@ static int venc_set_properties(struct venus_inst *inst)
        struct hfi_quantization quant;
        struct hfi_quantization_range quant_range;
        u32 ptype, rate_control, bitrate, profile = 0, level = 0;
+       u64 framerate;
        int ret;
 
        ret = venus_helper_set_work_mode(inst, VIDC_WORK_MODE_2);
@@ -659,9 +661,14 @@ static int venc_set_properties(struct venus_inst *inst)
        if (ret)
                return ret;
 
+       framerate = inst->timeperframe.denominator * FRAMERATE_FACTOR;
+       /* next line is to round up */
+       framerate += inst->timeperframe.numerator - 1;
+       do_div(framerate, inst->timeperframe.numerator);
+
        ptype = HFI_PROPERTY_CONFIG_FRAME_RATE;
        frate.buffer_type = HFI_BUFFER_OUTPUT;
-       frate.framerate = inst->fps * (1 << 16);
+       frate.framerate = framerate;
 
        ret = hfi_session_set_property(inst, ptype, &frate);
        if (ret)
-- 
2.17.1