pipeline: rpi: Remove disable_startup_frame_drops config option
With the previous change to not drop frames in the pipeline handler, the "disable_startup_frame_drops" pipeline config option is not used. Remove it, and throw a warning if the option is present in the YAML config file. Signed-off-by: Naushir Patuck <naush@raspberrypi.com> Reviewed-by: David Plowman <david.plowman@raspberrypi.com> Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
parent
6cf9c4d34f
commit
98d144fef3
4 changed files with 4 additions and 18 deletions
|
@ -1078,7 +1078,6 @@ void CameraData::enumerateVideoDevices(MediaLink *link, const std::string &front
|
|||
int CameraData::loadPipelineConfiguration()
|
||||
{
|
||||
config_ = {
|
||||
.disableStartupFrameDrops = false,
|
||||
.cameraTimeoutValue = 0,
|
||||
};
|
||||
|
||||
|
@ -1115,8 +1114,10 @@ int CameraData::loadPipelineConfiguration()
|
|||
|
||||
const YamlObject &phConfig = (*root)["pipeline_handler"];
|
||||
|
||||
config_.disableStartupFrameDrops =
|
||||
phConfig["disable_startup_frame_drops"].get<bool>(config_.disableStartupFrameDrops);
|
||||
if (phConfig.contains("disable_startup_frame_drops"))
|
||||
LOG(RPI, Warning)
|
||||
<< "The disable_startup_frame_drops key is now deprecated, "
|
||||
<< "startup frames are now identified by the FrameMetadata::Status::FrameStartup flag";
|
||||
|
||||
config_.cameraTimeoutValue =
|
||||
phConfig["camera_timeout_value_ms"].get<unsigned int>(config_.cameraTimeoutValue);
|
||||
|
|
|
@ -164,11 +164,6 @@ public:
|
|||
bool buffersAllocated_;
|
||||
|
||||
struct Config {
|
||||
/*
|
||||
* Override any request from the IPA to drop a number of startup
|
||||
* frames.
|
||||
*/
|
||||
bool disableStartupFrameDrops;
|
||||
/*
|
||||
* Override the camera timeout value calculated by the IPA based
|
||||
* on frame durations.
|
||||
|
|
|
@ -16,11 +16,6 @@
|
|||
#
|
||||
# "num_cfe_config_queue": 2,
|
||||
|
||||
# Override any request from the IPA to drop a number of startup
|
||||
# frames.
|
||||
#
|
||||
# "disable_startup_frame_drops": false,
|
||||
|
||||
# Custom timeout value (in ms) for camera to use. This overrides
|
||||
# the value computed by the pipeline handler based on frame
|
||||
# durations.
|
||||
|
|
|
@ -29,11 +29,6 @@
|
|||
#
|
||||
# "min_total_unicam_buffers": 4,
|
||||
|
||||
# Override any request from the IPA to drop a number of startup
|
||||
# frames.
|
||||
#
|
||||
# "disable_startup_frame_drops": false,
|
||||
|
||||
# Custom timeout value (in ms) for camera to use. This overrides
|
||||
# the value computed by the pipeline handler based on frame
|
||||
# durations.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue