Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4b1d681 authored by Srinu Gorle's avatar Srinu Gorle
Browse files

msm: vidc: align same default frame rate between video driver and firmware 



Video driver is ignoring client frame rate setting, if existing frame rate
and client setting are same. Due to this venus firmware is encoding with
default frame rate 15,  which is causing output bit rate deviation.

This change make sure, default frame rates in video driver and
venus firmware are same.

Change-Id: I506799bca077b644e65cca1bb1cd8e9414400424
Signed-off-by: default avatarSrinu Gorle <sgorle@codeaurora.org>
parent 381ae7d0

drivers/media/platform/msm/vidc/msm_vdec.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1972,7 +1972,7 @@ int msm_vdec_inst_init(struct msm_vidc_inst *inst) 
	inst->capability.secure_output2_threshold.max = 0;

	inst->buffer_mode_set[OUTPUT_PORT] = HAL_BUFFER_MODE_STATIC;

	inst->buffer_mode_set[CAPTURE_PORT] = HAL_BUFFER_MODE_STATIC;

	inst->prop.fps = 30;

	inst->prop.fps = DEFAULT_FPS;

	return rc;

}

drivers/media/platform/msm/vidc/msm_venc.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -3306,7 +3306,7 @@ int msm_venc_inst_init(struct msm_vidc_inst *inst) 
	inst->capability.secure_output2_threshold.max = 0;

	inst->buffer_mode_set[OUTPUT_PORT] = HAL_BUFFER_MODE_STATIC;

	inst->buffer_mode_set[CAPTURE_PORT] = HAL_BUFFER_MODE_STATIC;

	inst->prop.fps = 30;

	inst->prop.fps = DEFAULT_FPS;

	inst->capability.pixelprocess_capabilities = 0;

	return rc;

}

drivers/media/platform/msm/vidc/msm_vidc_internal.h

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -43,6 +43,7 @@ 
#define DEFAULT_WIDTH 1920

#define MIN_SUPPORTED_WIDTH 32

#define MIN_SUPPORTED_HEIGHT 32

#define DEFAULT_FPS 15



/* Maintains the number of FTB's between each FBD over a window */

#define DCVS_FTB_WINDOW 32