Skip to content

Add target liveviewFPS parameters #1343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Nekomeshi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add target liveviewFPS parameters #1343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions indi-gphoto/gphoto_ccd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#define MAX_DEVICES 5 /* Max device cameraCount */
#define FOCUS_TIMER 50
#define MAX_RETRIES 3
static const char * STREAM_TAB = "Streaming"; //Original is declared in streammanager.cpp

#ifdef __APPLE__
// getprogname() is a BSD/Darwin function present in the runtime but hidden from
Expand Down Expand Up @@ -336,6 +337,12 @@ bool GPhotoCCD::initProperties()

SetCCDCapability(CCD_CAN_SUBFRAME | CCD_CAN_BIN | CCD_CAN_ABORT | CCD_HAS_BAYER | CCD_HAS_STREAMING);

//Liveview Target FPS
TargetLiveviewFPSNP[0].fill("TargetFPS", "TargetFPS", "%.1f", 1,60, 0.1, 30);
TargetLiveviewFPSNP[1].fill("Wait", "Wait(mS)", "%1.0f", 0, 1000, 1, 0);
TargetLiveviewFPSNP.fill(getDeviceName(), "TARGET_FPS", "Target FPS", STREAM_TAB, IP_RW, 60, IPS_IDLE);
TargetLiveviewFPSNP.load();

Streamer->setStreamingExposureEnabled(false);

#if 0
Expand Down Expand Up @@ -449,6 +456,7 @@ bool GPhotoCCD::updateProperties()

defineProperty(ForceBULBSP);
defineProperty(DownloadTimeoutNP);
defineProperty(TargetLiveviewFPSNP);
}
else
{
Expand All @@ -475,6 +483,7 @@ bool GPhotoCCD::updateProperties()

deleteProperty(ForceBULBSP);
deleteProperty(DownloadTimeoutNP);
deleteProperty(TargetLiveviewFPSNP);

HideExtendedOptions();
}
Expand Down Expand Up @@ -804,6 +813,15 @@ bool GPhotoCCD::ISNewNumber(const char * dev, const char * name, double values[]
return true;
}

//Liveview FPS
if (TargetLiveviewFPSNP.isNameMatch(name)){
TargetLiveviewFPSNP.update(values, names, n);
TargetLiveviewFPSNP.setState(IPS_OK);
TargetLiveviewFPSNP.apply();
saveConfig(TargetLiveviewFPSNP);
return true;
}

// Download Timeout
if (DownloadTimeoutNP.isNameMatch(name))
{
Expand Down Expand Up @@ -1967,6 +1985,8 @@ void GPhotoCCD::streamLiveView()
char errMsg[MAXRBUF] = {0};
while (true)
{
std::chrono::system_clock::time_point start = std::chrono::system_clock::now();

std::unique_lock<std::mutex> guard(liveStreamMutex);
if (m_RunLiveStream == false)
break;
Expand Down Expand Up @@ -2082,6 +2102,12 @@ void GPhotoCCD::streamLiveView()
PrimaryCCD.setFrameBufferSize(size, false);

Streamer->newFrame(ccdBuffer, size);

std::chrono::duration<double> sec = std::chrono::system_clock::now() - start;
int sleepMS = sec.count()*1000;
sleepMS = 1000/TargetLiveviewFPSNP[0].value - sleepMS;
sleepMS = sleepMS < 0 ? TargetLiveviewFPSNP[1].value:sleepMS + TargetLiveviewFPSNP[1].value;
std::this_thread::sleep_for(std::chrono::milliseconds(sleepMS));
}

gp_file_unref(previewFile);
Expand Down
2 changes: 2 additions & 0 deletions indi-gphoto/gphoto_ccd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,8 @@ class GPhotoCCD : public INDI::CCD, public INDI::FocuserInterface
// Upload file, used for testing purposes under simulation under native mode
INDI::PropertyText UploadFileTP {1};
INDI::PropertyBlob imageBP {INDI::Property()};
// Target liveview FPS
INDI::PropertyNumber TargetLiveviewFPSNP {2};

Camera * camera = nullptr;

Expand Down