StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
krepa098 2014-10-08 16:19:42 +02:00
parent 200b7bc395
commit 8ddb1329c9
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
widget/camera.cpp
View File

@ -317,15 +317,16 @@ void SelfCamWorker::probeResolutions()
for (QSize res : propbeRes)
{
_setProp(CV_CAP_PROP_FRAME_WIDTH, res.width());
_setProp(CV_CAP_PROP_FRAME_HEIGHT, res.height());
cam.set(CV_CAP_PROP_FRAME_WIDTH, res.width());
cam.set(CV_CAP_PROP_FRAME_HEIGHT, res.height());
double w = _getProp(CV_CAP_PROP_FRAME_WIDTH);
double h = _getProp(CV_CAP_PROP_FRAME_HEIGHT);
double w = cam.get(CV_CAP_PROP_FRAME_WIDTH);
double h = cam.get(CV_CAP_PROP_FRAME_HEIGHT);
qDebug() << "PROBING:" << res << " got " << w << h;
//qDebug() << "PROBING:" << res << " got " << w << h;
resolutions.append(QSize(w,h));
if (!resolutions.contains(QSize(w,h)))
resolutions.append(QSize(w,h));
}
unsubscribe();

14
widget/selfcamview.cpp
View File

@ -29,7 +29,7 @@ SelfCamView::SelfCamView(VideoSource *Source, QWidget* parent)
, program(nullptr)
, textureId(0)
, pboAllocSize(0)
, useNewFrame(false)
, uploadFrame(false)
, hasSubscribed(false)
{
qDebug()<<"NEW VideoSurface:"<<source->resolution();
@ -78,8 +78,6 @@ void SelfCamView::initializeGL()
void SelfCamView::paintGL()
{
//qDebug() << "PainterThread" << QThread::currentThreadId();
if (!pbo)
{
qDebug() << "Creating pbo, program";
@ -125,7 +123,7 @@ void SelfCamView::paintGL()
}
if (useNewFrame)
if (uploadFrame)
{
source->lock();
void* frame = source->getData();
@ -158,6 +156,8 @@ void SelfCamView::paintGL()
glBindTexture(GL_TEXTURE_2D, 0);
pbo->release();
uploadFrame = false;
}
// render pbo
@ -187,15 +187,11 @@ void SelfCamView::paintGL()
program->disableAttributeArray(0);
program->release();
//glFlush();
useNewFrame = false;
}
void SelfCamView::updateGL()
{
useNewFrame = true;
uploadFrame = true;
QGLWidget::updateGL();
}

2
widget/selfcamview.h
View File

@ -50,7 +50,7 @@ private:
GLuint textureId;
int pboAllocSize;
QSize res;
bool useNewFrame;
bool uploadFrame;
bool hasSubscribed;
};