This ixes 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 that
the framerate one is 1 << 16 units.
Signed-off-by: Stanimir Varbanov <stanimir.varba...@linaro.org>
---
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 32cff294582f..8c939af0a1f6 100644
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -31,6 +31,7 @@
#include "venc.h"
#define NUM_B_FRAMES_MAX 4
+#define FRAMERATE_FACTOR (1 << 16)
/*
* Three resons to keep MPLANE formats (despite that the number of planes
@@ -581,7 +582,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);
@@ -604,12 +605,12 @@ static int venc_enum_frameintervals(struct file *file,
void *fh,
fival->height < frame_height_min(inst))
return -EINVAL;
- fival->stepwise.min.numerator = 1;
+ fival->stepwise.min.numerator = FRAMERATE_FACTOR;
fival->stepwise.min.denominator = frate_max(inst);
- fival->stepwise.max.numerator = 1;
+ fival->stepwise.max.numerator = FRAMERATE_FACTOR;
fival->stepwise.max.denominator = frate_min(inst);
fival->stepwise.step.numerator = 1;
- fival->stepwise.step.denominator = frate_max(inst);
+ fival->stepwise.step.denominator = 1;
return 0;
}
@@ -654,6 +655,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);
@@ -664,9 +666,14 @@ static int venc_set_properties(struct venus_inst *inst)
if (ret)
return ret;
+ framerate = inst->timeperframe.denominator * FRAMERATE_FACTOR;
+ framerate = DIV_ROUND_UP(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;
+ if (frate.framerate > frate_max(inst))
+ frate.framerate = frate_max(inst);
ret = hfi_session_set_property(inst, ptype, &frate);
if (ret)
--
2.17.1
