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

chore(videosurface): Use UNIX line endings.

Browse Source
This commit is contained in:
iphydf 2020-04-23 00:00:03 +00:00
parent 00d08d9887
commit 25a7817229
No known key found for this signature in database
GPG Key ID: 3855DBA2D74403C9
2 changed files with 317 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

484
src/video/videosurface.cpp
View File

@ -1,242 +1,242 @@
/*
Copyright © 2014-2019 by The qTox Project Contributors
This file is part of qTox, a Qt-based graphical interface for Tox.
qTox is libre software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
qTox is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with qTox. If not, see <http://www.gnu.org/licenses/>.
*/
#include "videosurface.h"
#include "src/core/core.h"
#include "src/model/friend.h"
#include "src/friendlist.h"
#include "src/persistence/settings.h"
#include "src/video/videoframe.h"
#include "src/widget/friendwidget.h"
#include "src/widget/style.h"
#include <QDebug>
#include <QLabel>
#include <QPainter>
/**
* @var std::atomic_bool VideoSurface::frameLock
* @brief Fast lock for lastFrame.
*/
float getSizeRatio(const QSize size)
{
return size.width() / static_cast<float>(size.height());
}
VideoSurface::VideoSurface(const QPixmap& avatar, QWidget* parent, bool expanding)
: QWidget{parent}
, source{nullptr}
, frameLock{false}
, hasSubscribed{0}
, avatar{avatar}
, ratio{1.0f}
, expanding{expanding}
{
recalulateBounds();
}
VideoSurface::VideoSurface(const QPixmap& avatar, VideoSource* source, QWidget* parent)
: VideoSurface(avatar, parent)
{
setSource(source);
}
VideoSurface::~VideoSurface()
{
unsubscribe();
}
bool VideoSurface::isExpanding() const
{
return expanding;
}
/**
* @brief Update source.
* @note nullptr is a valid option.
* @param src source to set.
*
* Unsubscribe from old source and subscribe to new.
*/
void VideoSurface::setSource(VideoSource* src)
{
if (source == src)
return;
unsubscribe();
source = src;
subscribe();
}
QRect VideoSurface::getBoundingRect() const
{
QRect bRect = boundingRect;
bRect.setBottomRight(QPoint(boundingRect.bottom() + 1, boundingRect.right() + 1));
return boundingRect;
}
float VideoSurface::getRatio() const
{
return ratio;
}
void VideoSurface::setAvatar(const QPixmap& pixmap)
{
avatar = pixmap;
update();
}
QPixmap VideoSurface::getAvatar() const
{
return avatar;
}
void VideoSurface::subscribe()
{
if (source && hasSubscribed++ == 0) {
source->subscribe();
connect(source, &VideoSource::frameAvailable, this, &VideoSurface::onNewFrameAvailable);
connect(source, &VideoSource::sourceStopped, this, &VideoSurface::onSourceStopped);
}
}
void VideoSurface::unsubscribe()
{
if (!source || hasSubscribed == 0)
return;
if (--hasSubscribed != 0)
return;
lock();
lastFrame.reset();
unlock();
ratio = 1.0f;
recalulateBounds();
emit ratioChanged();
emit boundaryChanged();
disconnect(source, &VideoSource::frameAvailable, this, &VideoSurface::onNewFrameAvailable);
disconnect(source, &VideoSource::sourceStopped, this, &VideoSurface::onSourceStopped);
source->unsubscribe();
}
void VideoSurface::onNewFrameAvailable(const std::shared_ptr<VideoFrame>& newFrame)
{
QSize newSize;
lock();
lastFrame = newFrame;
newSize = lastFrame->getSourceDimensions().size();
unlock();
float newRatio = getSizeRatio(newSize);
if (!qFuzzyCompare(newRatio, ratio) && isVisible()) {
ratio = newRatio;
recalulateBounds();
emit ratioChanged();
emit boundaryChanged();
}
update();
}
void VideoSurface::onSourceStopped()
{
// If the source's stream is on hold, just revert back to the avatar view
lastFrame.reset();
update();
}
void VideoSurface::paintEvent(QPaintEvent*)
{
lock();
QPainter painter(this);
painter.fillRect(painter.viewport(), Qt::black);
if (lastFrame) {
QImage frame = lastFrame->toQImage(rect().size());
if (frame.isNull())
lastFrame.reset();
painter.drawImage(boundingRect, frame, frame.rect(), Qt::NoFormatConversion);
} else {
painter.fillRect(boundingRect, Qt::white);
QPixmap drawnAvatar = avatar;
if (drawnAvatar.isNull())
drawnAvatar = Style::scaleSvgImage(":/img/contact_dark.svg", boundingRect.width(),
boundingRect.height());
painter.drawPixmap(boundingRect, drawnAvatar, drawnAvatar.rect());
}
unlock();
}
void VideoSurface::resizeEvent(QResizeEvent* event)
{
QWidget::resizeEvent(event);
recalulateBounds();
emit boundaryChanged();
}
void VideoSurface::showEvent(QShowEvent* e)
{
Q_UNUSED(e)
// emit ratioChanged();
}
void VideoSurface::recalulateBounds()
{
if (expanding) {
boundingRect = contentsRect();
} else {
QPoint pos;
QSize size;
QSize usableSize = contentsRect().size();
int possibleWidth = usableSize.height() * ratio;
if (possibleWidth > usableSize.width())
size = (QSize(usableSize.width(), usableSize.width() / ratio));
else
size = (QSize(possibleWidth, usableSize.height()));
pos.setX(width() / 2 - size.width() / 2);
pos.setY(height() / 2 - size.height() / 2);
boundingRect.setRect(pos.x(), pos.y(), size.width(), size.height());
}
update();
}
void VideoSurface::lock()
{
// Fast lock
bool expected = false;
while (!frameLock.compare_exchange_weak(expected, true))
expected = false;
}
void VideoSurface::unlock()
{
frameLock = false;
}
/*
Copyright © 2014-2019 by The qTox Project Contributors
This file is part of qTox, a Qt-based graphical interface for Tox.
qTox is libre software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
qTox is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with qTox. If not, see <http://www.gnu.org/licenses/>.
*/
#include "videosurface.h"
#include "src/core/core.h"
#include "src/model/friend.h"
#include "src/friendlist.h"
#include "src/persistence/settings.h"
#include "src/video/videoframe.h"
#include "src/widget/friendwidget.h"
#include "src/widget/style.h"
#include <QDebug>
#include <QLabel>
#include <QPainter>
/**
* @var std::atomic_bool VideoSurface::frameLock
* @brief Fast lock for lastFrame.
*/
float getSizeRatio(const QSize size)
{
return size.width() / static_cast<float>(size.height());
}
VideoSurface::VideoSurface(const QPixmap& avatar, QWidget* parent, bool expanding)
: QWidget{parent}
, source{nullptr}
, frameLock{false}
, hasSubscribed{0}
, avatar{avatar}
, ratio{1.0f}
, expanding{expanding}
{
recalulateBounds();
}
VideoSurface::VideoSurface(const QPixmap& avatar, VideoSource* source, QWidget* parent)
: VideoSurface(avatar, parent)
{
setSource(source);
}
VideoSurface::~VideoSurface()
{
unsubscribe();
}
bool VideoSurface::isExpanding() const
{
return expanding;
}
/**
* @brief Update source.
* @note nullptr is a valid option.
* @param src source to set.
*
* Unsubscribe from old source and subscribe to new.
*/
void VideoSurface::setSource(VideoSource* src)
{
if (source == src)
return;
unsubscribe();
source = src;
subscribe();
}
QRect VideoSurface::getBoundingRect() const
{
QRect bRect = boundingRect;
bRect.setBottomRight(QPoint(boundingRect.bottom() + 1, boundingRect.right() + 1));
return boundingRect;
}
float VideoSurface::getRatio() const
{
return ratio;
}
void VideoSurface::setAvatar(const QPixmap& pixmap)
{
avatar = pixmap;
update();
}
QPixmap VideoSurface::getAvatar() const
{
return avatar;
}
void VideoSurface::subscribe()
{
if (source && hasSubscribed++ == 0) {
source->subscribe();
connect(source, &VideoSource::frameAvailable, this, &VideoSurface::onNewFrameAvailable);
connect(source, &VideoSource::sourceStopped, this, &VideoSurface::onSourceStopped);
}
}
void VideoSurface::unsubscribe()
{
if (!source || hasSubscribed == 0)
return;
if (--hasSubscribed != 0)
return;
lock();
lastFrame.reset();
unlock();
ratio = 1.0f;
recalulateBounds();
emit ratioChanged();
emit boundaryChanged();
disconnect(source, &VideoSource::frameAvailable, this, &VideoSurface::onNewFrameAvailable);
disconnect(source, &VideoSource::sourceStopped, this, &VideoSurface::onSourceStopped);
source->unsubscribe();
}
void VideoSurface::onNewFrameAvailable(const std::shared_ptr<VideoFrame>& newFrame)
{
QSize newSize;
lock();
lastFrame = newFrame;
newSize = lastFrame->getSourceDimensions().size();
unlock();
float newRatio = getSizeRatio(newSize);
if (!qFuzzyCompare(newRatio, ratio) && isVisible()) {
ratio = newRatio;
recalulateBounds();
emit ratioChanged();
emit boundaryChanged();
}
update();
}
void VideoSurface::onSourceStopped()
{
// If the source's stream is on hold, just revert back to the avatar view
lastFrame.reset();
update();
}
void VideoSurface::paintEvent(QPaintEvent*)
{
lock();
QPainter painter(this);
painter.fillRect(painter.viewport(), Qt::black);
if (lastFrame) {
QImage frame = lastFrame->toQImage(rect().size());
if (frame.isNull())
lastFrame.reset();
painter.drawImage(boundingRect, frame, frame.rect(), Qt::NoFormatConversion);
} else {
painter.fillRect(boundingRect, Qt::white);
QPixmap drawnAvatar = avatar;
if (drawnAvatar.isNull())
drawnAvatar = Style::scaleSvgImage(":/img/contact_dark.svg", boundingRect.width(),
boundingRect.height());
painter.drawPixmap(boundingRect, drawnAvatar, drawnAvatar.rect());
}
unlock();
}
void VideoSurface::resizeEvent(QResizeEvent* event)
{
QWidget::resizeEvent(event);
recalulateBounds();
emit boundaryChanged();
}
void VideoSurface::showEvent(QShowEvent* e)
{
Q_UNUSED(e)
// emit ratioChanged();
}
void VideoSurface::recalulateBounds()
{
if (expanding) {
boundingRect = contentsRect();
} else {
QPoint pos;
QSize size;
QSize usableSize = contentsRect().size();
int possibleWidth = usableSize.height() * ratio;
if (possibleWidth > usableSize.width())
size = (QSize(usableSize.width(), usableSize.width() / ratio));
else
size = (QSize(possibleWidth, usableSize.height()));
pos.setX(width() / 2 - size.width() / 2);
pos.setY(height() / 2 - size.height() / 2);
boundingRect.setRect(pos.x(), pos.y(), size.width(), size.height());
}
update();
}
void VideoSurface::lock()
{
// Fast lock
bool expected = false;
while (!frameLock.compare_exchange_weak(expected, true))
expected = false;
}
void VideoSurface::unlock()
{
frameLock = false;
}

150
src/video/videosurface.h
View File

@ -1,75 +1,75 @@
/*
Copyright © 2014-2019 by The qTox Project Contributors
This file is part of qTox, a Qt-based graphical interface for Tox.
qTox is libre software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
qTox is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with qTox. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef SELFCAMVIEW_H
#define SELFCAMVIEW_H
#include "src/video/videosource.h"
#include <QWidget>
#include <atomic>
#include <memory>
class VideoSurface : public QWidget
{
Q_OBJECT
public:
VideoSurface(const QPixmap& avatar, QWidget* parent = nullptr, bool expanding = false);
VideoSurface(const QPixmap& avatar, VideoSource* source, QWidget* parent = nullptr);
~VideoSurface();
bool isExpanding() const;
void setSource(VideoSource* src);
QRect getBoundingRect() const;
float getRatio() const;
void setAvatar(const QPixmap& pixmap);
QPixmap getAvatar() const;
signals:
void ratioChanged();
void boundaryChanged();
protected:
void subscribe();
void unsubscribe();
void paintEvent(QPaintEvent* event) final;
void resizeEvent(QResizeEvent* event) final;
void showEvent(QShowEvent* event) final;
private slots:
void onNewFrameAvailable(const std::shared_ptr<VideoFrame>& newFrame);
void onSourceStopped();
private:
void recalulateBounds();
void lock();
void unlock();
QRect boundingRect;
VideoSource* source;
std::shared_ptr<VideoFrame> lastFrame;
std::atomic_bool frameLock;
uint8_t hasSubscribed;
QPixmap avatar;
float ratio;
bool expanding;
};
#endif // SELFCAMVIEW_H
/*
Copyright © 2014-2019 by The qTox Project Contributors
This file is part of qTox, a Qt-based graphical interface for Tox.
qTox is libre software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
qTox is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with qTox. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef SELFCAMVIEW_H
#define SELFCAMVIEW_H
#include "src/video/videosource.h"
#include <QWidget>
#include <atomic>
#include <memory>
class VideoSurface : public QWidget
{
Q_OBJECT
public:
VideoSurface(const QPixmap& avatar, QWidget* parent = nullptr, bool expanding = false);
VideoSurface(const QPixmap& avatar, VideoSource* source, QWidget* parent = nullptr);
~VideoSurface();
bool isExpanding() const;
void setSource(VideoSource* src);
QRect getBoundingRect() const;
float getRatio() const;
void setAvatar(const QPixmap& pixmap);
QPixmap getAvatar() const;
signals:
void ratioChanged();
void boundaryChanged();
protected:
void subscribe();
void unsubscribe();
void paintEvent(QPaintEvent* event) final;
void resizeEvent(QResizeEvent* event) final;
void showEvent(QShowEvent* event) final;
private slots:
void onNewFrameAvailable(const std::shared_ptr<VideoFrame>& newFrame);
void onSourceStopped();
private:
void recalulateBounds();
void lock();
void unlock();
QRect boundingRect;
VideoSource* source;
std::shared_ptr<VideoFrame> lastFrame;
std::atomic_bool frameLock;
uint8_t hasSubscribed;
QPixmap avatar;
float ratio;
bool expanding;
};
#endif // SELFCAMVIEW_H