VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-15 12:51:49 -05:00
Code Issues Projects Releases Wiki Activity

ATV Modulator: transmit video basic

Browse Source
This commit is contained in:
f4exb 2017-03-09 21:37:22 +01:00
parent 2a64878d7f
commit d642e132d1
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/channeltx/modatv/atvmod.cpp
View File

@ -181,7 +181,7 @@ void ATVMod::pullVideo(Real& sample)
m_lineCount = 0; m_lineCount = 0;
m_evenImage = !m_evenImage; m_evenImage = !m_evenImage;
if (m_running.m_atvModInput == ATVModInputVideo) if ((m_running.m_atvModInput == ATVModInputVideo) && m_videoOK)
{ {
int grabOK; int grabOK;
int fpsIncrement = (int) m_videoFPSCount - m_videoPrevFPSCount; int fpsIncrement = (int) m_videoFPSCount - m_videoPrevFPSCount;
@ -199,8 +199,12 @@ void ATVMod::pullVideo(Real& sample)
{ {
cv::Mat colorFrame; cv::Mat colorFrame;
m_video.retrieve(colorFrame); m_video.retrieve(colorFrame);
cv::cvtColor(colorFrame, m_frameOriginal, CV_BGR2GRAY);
resizeVideo(); if (!colorFrame.empty()) // some frames may not come out properly
{
cv::cvtColor(colorFrame, m_frameOriginal, CV_BGR2GRAY);
resizeVideo();
}
} }
else else
{ {
@ -450,9 +454,20 @@ void ATVMod::openVideo(const QString& fileName)
m_videoFPS = m_video.get(CV_CAP_PROP_FPS); m_videoFPS = m_video.get(CV_CAP_PROP_FPS);
m_videoWidth = (int) m_video.get(CV_CAP_PROP_FRAME_WIDTH); m_videoWidth = (int) m_video.get(CV_CAP_PROP_FRAME_WIDTH);
m_videoHeight = (int) m_video.get(CV_CAP_PROP_FRAME_HEIGHT); m_videoHeight = (int) m_video.get(CV_CAP_PROP_FRAME_HEIGHT);
qDebug("ATVMod::openVideo(: FPS: %f size: %d x %d", m_videoFPS, m_videoWidth, m_videoHeight); int ex = static_cast<int>(m_video.get(CV_CAP_PROP_FOURCC));
char ext[] = {(char)(ex & 0XFF),(char)((ex & 0XFF00) >> 8),(char)((ex & 0XFF0000) >> 16),(char)((ex & 0XFF000000) >> 24),0};
qDebug("ATVMod::openVideo: %s FPS: %f size: %d x %d codec: %s",
m_video.isOpened() ? "OK" : "KO",
m_videoFPS,
m_videoWidth,
m_videoHeight,
ext);
calculateVideoSizes(); calculateVideoSizes();
} }
else
{
qDebug("ATVMod::openVideo: cannot open video file");
}
} }
void ATVMod::resizeImage() void ATVMod::resizeImage()