From: Stanimir Varbanov <stanimir.varbanov@linaro.org>
To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-msm@vger.kernel.org
Cc: Nicolas Dufresne <nicolas@ndufresne.ca>,
Stanimir Varbanov <stanimir.varbanov@linaro.org>,
Loic Poulain <loic.poulain@linaro.org>
Subject: [PATCH v3] venus: enc: fix enum_frameintervals
Date: Thu, 12 Sep 2019 11:25:10 +0300 [thread overview]
Message-ID: <20190912082510.31399-1-stanimir.varbanov@linaro.org> (raw)
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: Loic Poulain <loic.poulain@linaro.org>
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
---
drivers/media/platform/qcom/venus/venc.c | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
index 1b7fb2d5887c..bf2dd9287c32 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 (1 << 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);
@@ -599,12 +600,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.denominator = frate_max(inst);
- fival->stepwise.max.numerator = 1;
- fival->stepwise.max.denominator = frate_min(inst);
+ fival->stepwise.min.numerator = FRAMERATE_FACTOR;
+ fival->stepwise.min.denominator = frate_max(inst) * FRAMERATE_FACTOR;
+ fival->stepwise.max.numerator = FRAMERATE_FACTOR;
+ 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,16 @@ 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;
+ if (frate.framerate > frate_max(inst) * FRAMERATE_FACTOR)
+ frate.framerate = frate_max(inst) * FRAMERATE_FACTOR;
ret = hfi_session_set_property(inst, ptype, &frate);
if (ret)
--
2.17.1
reply other threads:[~2019-09-12 8:25 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190912082510.31399-1-stanimir.varbanov@linaro.org \
--to=stanimir.varbanov@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=loic.poulain@linaro.org \
--cc=nicolas@ndufresne.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).