mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

ATV Modulator: use exclusively operator>> to retrieve camera frames

pull/27/head
f4exb 2017-03-13 22:45:00 +01:00
rodzic 09e3a0fd8e
commit 0fa8fc486a
1 zmienionych plików z 20 dodań i 26 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

46
plugins/channeltx/modatv/atvmod.cpp
Wyświetl plik

@ -328,43 +328,37 @@ void ATVMod::pullVideo(Real& sample)
getOutputMessageQueue()->push(report);
}
int grabOK;
int fpsIncrement = (int) camera.m_videoFPSCount - camera.m_videoPrevFPSCount;
// move a number of frames according to increment
// use grab to test for EOF then retrieve to preserve last valid frame as the current original frame
// TODO: handle pause (no move)
cv::Mat colorFrame;
for (int i = 0; i < fpsIncrement; i++)
{
grabOK = camera.m_camera.grab();
if (!grabOK) break;
camera.m_camera >> colorFrame;
if (colorFrame.empty()) break;
}
if (grabOK)
if (!colorFrame.empty()) // some frames may not come out properly
{
cv::Mat colorFrame;
camera.m_camera.retrieve(colorFrame);
if (!colorFrame.empty()) // some frames may not come out properly
{
if (m_showOverlayText) {
mixImageAndText(colorFrame);
}
cv::cvtColor(colorFrame, camera.m_videoframeOriginal, CV_BGR2GRAY);
resizeCamera();
if (m_showOverlayText) {
mixImageAndText(colorFrame);
}
if (camera.m_videoFPSCount < camera.m_videoFPS)
{
camera.m_videoPrevFPSCount = (int) camera.m_videoFPSCount;
camera.m_videoFPSCount += camera.m_videoFPSq;
}
else
{
camera.m_videoPrevFPSCount = 0;
camera.m_videoFPSCount = camera.m_videoFPSq;
}
cv::cvtColor(colorFrame, camera.m_videoframeOriginal, CV_BGR2GRAY);
resizeCamera();
}
if (camera.m_videoFPSCount < camera.m_videoFPS)
{
camera.m_videoPrevFPSCount = (int) camera.m_videoFPSCount;
camera.m_videoFPSCount += camera.m_videoFPSq;
}
else
{
camera.m_videoPrevFPSCount = 0;
camera.m_videoFPSCount = camera.m_videoFPSq;
}
}
}