diff --git a/src/ipa/rpi/controller/agc_status.h b/src/ipa/rpi/controller/agc_status.h index 956d6abf..1ae069f2 100644 --- a/src/ipa/rpi/controller/agc_status.h +++ b/src/ipa/rpi/controller/agc_status.h @@ -44,6 +44,5 @@ struct AgcStatus { }; struct AgcPrepareStatus { - double digitalGain; int locked; }; diff --git a/src/ipa/rpi/controller/rpi/agc_channel.cpp b/src/ipa/rpi/controller/rpi/agc_channel.cpp index e56f955a..154551df 100644 --- a/src/ipa/rpi/controller/rpi/agc_channel.cpp +++ b/src/ipa/rpi/controller/rpi/agc_channel.cpp @@ -480,26 +480,10 @@ void AgcChannel::prepare(Metadata *imageMetadata) AgcPrepareStatus prepareStatus; prepareStatus.locked = false; - prepareStatus.digitalGain = 1.0; - if (!imageMetadata->get("device.status", deviceStatus)) { + if (!imageMetadata->get("device.status", deviceStatus)) prepareStatus.locked = updateLockStatus(deviceStatus); - /* - * For now, the IPA code is still expecting the digital gain to come back in - * the prepare_status. To keep things happy, we'll just fill in the value that - * we calculated previously and put in the AgcStatus (which comes back as the - * "delayed" status). Once the rest of the IPA code is updated, we'll be able - * to remove this, and indeed remove the digitalGain from the AgcPrepareStatus. - */ - AgcStatus delayedStatus; - if (!imageMetadata->get("agc.delayed_status", delayedStatus)) - prepareStatus.digitalGain = delayedStatus.digitalGain; - else - /* After a mode switch, this must be correct until new values come through. */ - prepareStatus.digitalGain = status_.digitalGain; - } - imageMetadata->set("agc.prepare_status", prepareStatus); }