补拍的时间处理保护

补拍应该不会存在拍照计划时间为0的情况,这儿这样处理,是为了外部特殊处理,故意把拍照计划时间置为0
ndkvideo
Matthew 4 months ago
parent c08b8a03b1
commit f2db516071

@ -1618,9 +1618,14 @@ bool CPhoneDevice::TakePhotoWithNetCamera(IDevice::PHOTO_INFO& localPhotoInfo, c
}
if (localPhotoInfo.remedy != 0)
{
if ((takingTime - localPhotoInfo.scheduleTime) > 30)
time_t scheduleTime = localPhotoInfo.scheduleTime;
if (scheduleTime == 0)
{
takingTime = localPhotoInfo.scheduleTime + localPhotoInfo.channel * 2;
scheduleTime = localPhotoInfo.requestTime;
}
if ((takingTime - scheduleTime) > 30)
{
takingTime = scheduleTime + localPhotoInfo.channel * 2;
}
}
@ -1857,9 +1862,14 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<
time_t takingTime = ts;
if (localPhotoInfo.remedy != 0)
{
if ((takingTime - localPhotoInfo.scheduleTime) > 30)
time_t scheduleTime = localPhotoInfo.scheduleTime;
if (scheduleTime == 0)
{
scheduleTime = localPhotoInfo.requestTime;
}
if ((takingTime - scheduleTime) > 30)
{
takingTime = localPhotoInfo.scheduleTime + localPhotoInfo.channel * 2;
takingTime = scheduleTime + localPhotoInfo.channel * 2;
}
}
IMAGE_DEF photo = { 0 };
@ -2164,9 +2174,14 @@ bool CPhoneDevice::onOneCapture(std::shared_ptr<ACameraMetadata> characteristics
time_t takingTime = time(NULL);
if (mPhotoInfo.remedy != 0)
{
if ((takingTime - mPhotoInfo.scheduleTime) > 30)
time_t scheduleTime = mPhotoInfo.scheduleTime;
if (scheduleTime == 0)
{
scheduleTime = mPhotoInfo.requestTime;
}
if ((takingTime - scheduleTime) > 30)
{
takingTime = mPhotoInfo.scheduleTime + mPhotoInfo.channel * 2;
takingTime = scheduleTime + mPhotoInfo.channel * 2;
}
}
mPhotoInfo.photoTime = takingTime;
@ -2295,9 +2310,14 @@ bool CPhoneDevice::onBurstCapture(std::shared_ptr<ACameraMetadata> characteristi
time_t takingTime = time(NULL);
if (mPhotoInfo.remedy != 0)
{
if ((takingTime - mPhotoInfo.scheduleTime) > 30)
time_t scheduleTime = mPhotoInfo.scheduleTime;
if (scheduleTime == 0)
{
takingTime = mPhotoInfo.scheduleTime + mPhotoInfo.channel * 2;
scheduleTime = mPhotoInfo.requestTime;
}
if ((takingTime - scheduleTime) > 30)
{
takingTime = scheduleTime + mPhotoInfo.channel * 2;
}
}
mPhotoInfo.photoTime = takingTime;
@ -2667,9 +2687,14 @@ bool CPhoneDevice::onBurstCapture(std::shared_ptr<ACameraMetadata> characteristi
time_t takingTime = time(NULL);
if (mPhotoInfo.remedy != 0)
{
if ((takingTime - mPhotoInfo.scheduleTime) > 30)
time_t scheduleTime = mPhotoInfo.scheduleTime;
if (scheduleTime == 0)
{
scheduleTime = mPhotoInfo.requestTime;
}
if ((takingTime - scheduleTime) > 30)
{
takingTime = mPhotoInfo.scheduleTime + mPhotoInfo.channel * 2;
takingTime = scheduleTime + mPhotoInfo.channel * 2;
}
}
mPhotoInfo.photoTime = takingTime;
@ -3006,9 +3031,14 @@ bool CPhoneDevice::OnImageReady(cv::Mat& mat)
time_t takingTime = time(NULL);
if (mPhotoInfo.remedy != 0)
{
if ((takingTime - mPhotoInfo.scheduleTime) > 30)
time_t scheduleTime = mPhotoInfo.scheduleTime;
if (scheduleTime == 0)
{
scheduleTime = mPhotoInfo.requestTime;
}
if ((takingTime - scheduleTime) > 30)
{
takingTime = mPhotoInfo.scheduleTime + mPhotoInfo.channel * 2;
takingTime = scheduleTime + mPhotoInfo.channel * 2;
}
}
mPhotoInfo.photoTime = takingTime;

Loading…
Cancel
Save