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

Commit 9f3261c0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents e15236d3 e4b1d681

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

+1 −1
Original line number Diff line number Diff line
@@ -3315,7 +3315,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

+1 −0
Original line number Diff line number Diff line
@@ -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