* [PATCH 1/2] media: venus: venc: configure entropy mode
@ 2017-11-24 9:34 Loic Poulain
2017-11-24 9:34 ` [PATCH 2/2] media: venus: venc: Apply inloop deblocking filter Loic Poulain
2017-11-24 12:53 ` [PATCH 1/2] media: venus: venc: configure entropy mode Stanimir Varbanov
0 siblings, 2 replies; 4+ messages in thread
From: Loic Poulain @ 2017-11-24 9:34 UTC (permalink / raw)
To: stanimir.varbanov, mchehab; +Cc: linux-media, linux-arm-msm, Loic Poulain
H264 entropy mode can be selected via V4L2 API but is eventually not
applied. Configure encoder with selected mode, CALVC (def) or CABAC.
Note that hw/firmware also expects a CABAC model configuration which
currently doesn't have existing V4L2 API control. For now, use model_0
which seems always supported and so the default one.
Signed-off-by: Loic Poulain <loic.poulain@linaro.org>
---
drivers/media/platform/qcom/venus/venc.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
index 6f123a3..d5d824e 100644
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -641,6 +641,7 @@ static int venc_set_properties(struct venus_inst *inst)
if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_H264) {
struct hfi_h264_vui_timing_info info;
+ struct hfi_h264_entropy_control entropy;
ptype = HFI_PROPERTY_PARAM_VENC_H264_VUI_TIMING_INFO;
info.enable = 1;
@@ -650,6 +651,16 @@ static int venc_set_properties(struct venus_inst *inst)
ret = hfi_session_set_property(inst, ptype, &info);
if (ret)
return ret;
+
+ ptype = HFI_PROPERTY_PARAM_VENC_H264_ENTROPY_CONTROL;
+ entropy.entropy_mode = venc_v4l2_to_hfi(
+ V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE,
+ ctr->h264_entropy_mode);
+ entropy.cabac_model = HFI_H264_CABAC_MODEL_0;
+
+ ret = hfi_session_set_property(inst, ptype, &entropy);
+ if (ret)
+ return ret;
}
ptype = HFI_PROPERTY_CONFIG_VENC_IDR_PERIOD;
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] media: venus: venc: Apply inloop deblocking filter
2017-11-24 9:34 [PATCH 1/2] media: venus: venc: configure entropy mode Loic Poulain
@ 2017-11-24 9:34 ` Loic Poulain
2017-11-24 12:53 ` Stanimir Varbanov
2017-11-24 12:53 ` [PATCH 1/2] media: venus: venc: configure entropy mode Stanimir Varbanov
1 sibling, 1 reply; 4+ messages in thread
From: Loic Poulain @ 2017-11-24 9:34 UTC (permalink / raw)
To: stanimir.varbanov, mchehab; +Cc: linux-media, linux-arm-msm, Loic Poulain
Deblocking filter allows to reduce blocking artifacts and improve
visual quality. This is configurable via the V4L2 API but eventually
not applied to the encoder.
Note that alpha and beta deblocking values are 32-bit signed (-6;+6).
Signed-off-by: Loic Poulain <loic.poulain@linaro.org>
---
drivers/media/platform/qcom/venus/core.h | 4 ++--
drivers/media/platform/qcom/venus/hfi_helper.h | 4 ++--
drivers/media/platform/qcom/venus/venc.c | 22 ++++++++++++++++++++++
3 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
index cba092b..4833af7 100644
--- a/drivers/media/platform/qcom/venus/core.h
+++ b/drivers/media/platform/qcom/venus/core.h
@@ -144,8 +144,8 @@ struct venc_controls {
u32 h264_min_qp;
u32 h264_max_qp;
u32 h264_loop_filter_mode;
- u32 h264_loop_filter_alpha;
- u32 h264_loop_filter_beta;
+ s32 h264_loop_filter_alpha;
+ s32 h264_loop_filter_beta;
u32 vp8_min_qp;
u32 vp8_max_qp;
diff --git a/drivers/media/platform/qcom/venus/hfi_helper.h b/drivers/media/platform/qcom/venus/hfi_helper.h
index 8d282db..55d8eb2 100644
--- a/drivers/media/platform/qcom/venus/hfi_helper.h
+++ b/drivers/media/platform/qcom/venus/hfi_helper.h
@@ -585,8 +585,8 @@ struct hfi_enable {
struct hfi_h264_db_control {
u32 mode;
- u32 slice_alpha_offset;
- u32 slice_beta_offset;
+ s32 slice_alpha_offset;
+ s32 slice_beta_offset;
};
#define HFI_H264_ENTROPY_CAVLC 0x1
diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
index d5d824e..1e79f49 100644
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -234,6 +234,16 @@ static int venc_v4l2_to_hfi(int id, int value)
case 3:
return HFI_VPX_PROFILE_VERSION_3;
}
+ case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE:
+ switch (value) {
+ case V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED:
+ default:
+ return HFI_H264_DB_MODE_ALL_BOUNDARY;
+ case V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED:
+ return HFI_H264_DB_MODE_DISABLE;
+ case V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY:
+ return HFI_H264_DB_MODE_SKIP_SLICE_BOUNDARY;
+ }
}
return 0;
@@ -642,6 +652,7 @@ static int venc_set_properties(struct venus_inst *inst)
if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_H264) {
struct hfi_h264_vui_timing_info info;
struct hfi_h264_entropy_control entropy;
+ struct hfi_h264_db_control deblock;
ptype = HFI_PROPERTY_PARAM_VENC_H264_VUI_TIMING_INFO;
info.enable = 1;
@@ -661,6 +672,17 @@ static int venc_set_properties(struct venus_inst *inst)
ret = hfi_session_set_property(inst, ptype, &entropy);
if (ret)
return ret;
+
+ ptype = HFI_PROPERTY_PARAM_VENC_H264_DEBLOCK_CONTROL;
+ deblock.mode = venc_v4l2_to_hfi(
+ V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE,
+ ctr->h264_loop_filter_mode);
+ deblock.slice_alpha_offset = ctr->h264_loop_filter_alpha;
+ deblock.slice_beta_offset = ctr->h264_loop_filter_beta;
+
+ ret = hfi_session_set_property(inst, ptype, &deblock);
+ if (ret)
+ return ret;
}
ptype = HFI_PROPERTY_CONFIG_VENC_IDR_PERIOD;
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 2/2] media: venus: venc: Apply inloop deblocking filter
2017-11-24 9:34 ` [PATCH 2/2] media: venus: venc: Apply inloop deblocking filter Loic Poulain
@ 2017-11-24 12:53 ` Stanimir Varbanov
0 siblings, 0 replies; 4+ messages in thread
From: Stanimir Varbanov @ 2017-11-24 12:53 UTC (permalink / raw)
To: Loic Poulain, stanimir.varbanov, mchehab; +Cc: linux-media, linux-arm-msm
Hi Loic,
Thanks for the patch!
On 11/24/2017 11:34 AM, Loic Poulain wrote:
> Deblocking filter allows to reduce blocking artifacts and improve
> visual quality. This is configurable via the V4L2 API but eventually
> not applied to the encoder.
>
> Note that alpha and beta deblocking values are 32-bit signed (-6;+6).
>
> Signed-off-by: Loic Poulain <loic.poulain@linaro.org>
> ---
> drivers/media/platform/qcom/venus/core.h | 4 ++--
> drivers/media/platform/qcom/venus/hfi_helper.h | 4 ++--
> drivers/media/platform/qcom/venus/venc.c | 22 ++++++++++++++++++++++
> 3 files changed, 26 insertions(+), 4 deletions(-)
Reviewed-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
--
regards,
Stan
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] media: venus: venc: configure entropy mode
2017-11-24 9:34 [PATCH 1/2] media: venus: venc: configure entropy mode Loic Poulain
2017-11-24 9:34 ` [PATCH 2/2] media: venus: venc: Apply inloop deblocking filter Loic Poulain
@ 2017-11-24 12:53 ` Stanimir Varbanov
1 sibling, 0 replies; 4+ messages in thread
From: Stanimir Varbanov @ 2017-11-24 12:53 UTC (permalink / raw)
To: Loic Poulain, stanimir.varbanov, mchehab; +Cc: linux-media, linux-arm-msm
Hi Loic,
Thanks for the patch!
On 11/24/2017 11:34 AM, Loic Poulain wrote:
> H264 entropy mode can be selected via V4L2 API but is eventually not
> applied. Configure encoder with selected mode, CALVC (def) or CABAC.
>
> Note that hw/firmware also expects a CABAC model configuration which
> currently doesn't have existing V4L2 API control. For now, use model_0
> which seems always supported and so the default one.
>
> Signed-off-by: Loic Poulain <loic.poulain@linaro.org>
> ---
> drivers/media/platform/qcom/venus/venc.c | 11 +++++++++++
> 1 file changed, 11 insertions(+)
Reviewed-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
--
regards,
Stan
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-11-24 12:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-24 9:34 [PATCH 1/2] media: venus: venc: configure entropy mode Loic Poulain
2017-11-24 9:34 ` [PATCH 2/2] media: venus: venc: Apply inloop deblocking filter Loic Poulain
2017-11-24 12:53 ` Stanimir Varbanov
2017-11-24 12:53 ` [PATCH 1/2] media: venus: venc: configure entropy mode Stanimir Varbanov
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).