video: driver: Modify default values for VBV Delay and Peak Bitrate

Modify cap values for below properties:
[1] VBV Dealy: default as 300, min as 100, and max as 300
[2] Peak bitrate: default as avg bitrate set by client.

Change-Id: Ic9533e8a40e789128e5baa975bf1a0355e373e08
Signed-off-by: Akshata Sahukar <asahukar@codeaurora.org>
This commit is contained in:
Akshata Sahukar
2021-04-26 18:35:06 -07:00
parent cf3fd457b3
commit 450a9e0e20
3 changed files with 3 additions and 8 deletions

View File

@@ -552,7 +552,7 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
NULL, msm_vidc_set_vbr_related_properties}, NULL, msm_vidc_set_vbr_related_properties},
{VBV_DELAY, ENC, H264|HEVC, {VBV_DELAY, ENC, H264|HEVC,
500, 2000, 500, 500, 100, 300, 100, 300,
V4L2_CID_MPEG_VIDEO_VBV_DELAY, V4L2_CID_MPEG_VIDEO_VBV_DELAY,
HFI_PROP_VBV_DELAY, HFI_PROP_VBV_DELAY,
CAP_FLAG_OUTPUT_PORT, CAP_FLAG_OUTPUT_PORT,
@@ -562,9 +562,7 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
{PEAK_BITRATE, ENC, H264|HEVC, {PEAK_BITRATE, ENC, H264|HEVC,
/* default peak bitrate is 10% larger than avrg bitrate */ /* default peak bitrate is 10% larger than avrg bitrate */
1, MAX_BITRATE, 1, 1, MAX_BITRATE, 1, DEFAULT_BITRATE,
(DEFAULT_BITRATE +
(DEFAULT_BITRATE / PERCENT_PEAK_BITRATE_INCREASED)),
V4L2_CID_MPEG_VIDEO_BITRATE_PEAK, V4L2_CID_MPEG_VIDEO_BITRATE_PEAK,
HFI_PROP_TOTAL_PEAK_BITRATE, HFI_PROP_TOTAL_PEAK_BITRATE,
CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT |

View File

@@ -54,7 +54,6 @@
#define MAX_HEVC_ENH_LAYER_SLIDING_WINDOW 5 #define MAX_HEVC_ENH_LAYER_SLIDING_WINDOW 5
#define MAX_AVC_ENH_LAYER_SLIDING_WINDOW 3 #define MAX_AVC_ENH_LAYER_SLIDING_WINDOW 3
#define MAX_AVC_ENH_LAYER_HYBRID_HP 5 #define MAX_AVC_ENH_LAYER_HYBRID_HP 5
#define PERCENT_PEAK_BITRATE_INCREASED 10
#define INVALID_DEFAULT_MARK_OR_USE_LTR -1 #define INVALID_DEFAULT_MARK_OR_USE_LTR -1
#define MAX_SLICES_PER_FRAME 10 #define MAX_SLICES_PER_FRAME 10
#define MAX_SLICES_FRAME_RATE 60 #define MAX_SLICES_FRAME_RATE 60

View File

@@ -1528,9 +1528,7 @@ int msm_vidc_adjust_peak_bitrate(void *instance, struct v4l2_ctrl *ctrl)
if (adjusted_value < bitrate) if (adjusted_value < bitrate)
adjusted_value = bitrate; adjusted_value = bitrate;
} else { } else {
adjusted_value = capability->cap[BIT_RATE].value + adjusted_value = capability->cap[BIT_RATE].value;
(capability->cap[BIT_RATE].value /
PERCENT_PEAK_BITRATE_INCREASED);
} }
msm_vidc_update_cap_value(inst, PEAK_BITRATE, msm_vidc_update_cap_value(inst, PEAK_BITRATE,