* [PATCH] venus: enc: fix enum_frameintervals
@ 2019-01-18 15:56 Stanimir Varbanov
2019-01-22 2:13 ` kbuild test robot
0 siblings, 1 reply; 2+ messages in thread
From: Stanimir Varbanov @ 2019-01-18 15:56 UTC (permalink / raw)
To: linux-media
Cc: linux-kernel, linux-arm-msm, Nicolas Dufresne, Hans Verkuil,
Stanimir Varbanov
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.varbanov@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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] venus: enc: fix enum_frameintervals
2019-01-18 15:56 [PATCH] venus: enc: fix enum_frameintervals Stanimir Varbanov
@ 2019-01-22 2:13 ` kbuild test robot
0 siblings, 0 replies; 2+ messages in thread
From: kbuild test robot @ 2019-01-22 2:13 UTC (permalink / raw)
To: Stanimir Varbanov
Cc: kbuild-all, linux-media, linux-kernel, linux-arm-msm,
Nicolas Dufresne, Hans Verkuil, Stanimir Varbanov
[-- Attachment #1: Type: text/plain, Size: 1066 bytes --]
Hi Stanimir,
I love your patch! Yet something to improve:
[auto build test ERROR on linuxtv-media/master]
[also build test ERROR on v5.0-rc2 next-20190116]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Stanimir-Varbanov/venus-enc-fix-enum_frameintervals/20190121-235146
base: git://linuxtv.org/media_tree.git master
config: parisc-allmodconfig (attached as .config)
compiler: hppa-linux-gnu-gcc (Debian 8.2.0-11) 8.2.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=8.2.0 make.cross ARCH=parisc
All errors (new ones prefixed by >>):
>> ERROR: "__udivdi3" [drivers/media/platform/qcom/venus/venus-enc.ko] undefined!
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 55496 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-22 2:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-18 15:56 [PATCH] venus: enc: fix enum_frameintervals Stanimir Varbanov
2019-01-22 2:13 ` kbuild test robot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).