d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-23 19:38:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix char out of range and media player signals

Browse source
This commit is contained in:
Nicolas Werner 2022-04-11 04:59:39 +02:00
parent c775a93f77
commit 159bec3654
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
6 changed files with 91 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Cache.cpp
View file

@ -4040,9 +4040,8 @@ Cache::displayName(const QString &room_id, const QString &user_id)
static bool
isDisplaynameSafe(const std::string &s)
{
for (uint32_t cc : QString::fromStdString(s).toStdU32String()) {
auto c = QChar(cc);
if (c.isPrint() && !c.isSpace())
for (char32_t c : QString::fromStdString(s).toUcs4()) {
if (QChar::isPrint(c) && !QChar::isSpace(c))
return false;
}

14
src/main.cpp
View file

@ -285,15 +285,17 @@ main(int argc, char *argv[])
QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedKingdom));
QTranslator qtTranslator;
if(qtTranslator.load(QLocale(),
QStringLiteral("qt"),
QStringLiteral("_"),
QLibraryInfo::path(QLibraryInfo::TranslationsPath)))
if (qtTranslator.load(QLocale(),
QStringLiteral("qt"),
QStringLiteral("_"),
QLibraryInfo::path(QLibraryInfo::TranslationsPath)))
app.installTranslator(&qtTranslator);
QTranslator appTranslator;
if(appTranslator.load(
QLocale(), QStringLiteral("nheko"), QStringLiteral("_"), QStringLiteral(":/translations")))
if (appTranslator.load(QLocale(),
QStringLiteral("nheko"),
QStringLiteral("_"),
QStringLiteral(":/translations")))
app.installTranslator(&appTranslator);
MainWindow w;

112
src/timeline/InputBar.cpp
View file

@ -5,20 +5,20 @@
#include "InputBar.h"
#include <QVideoSink>
#include <QBuffer>
#include <QClipboard>
#include <QDropEvent>
#include <QFileDialog>
#include <QGuiApplication>
#include <QInputMethod>
#include <QVideoFrame>
#include <QMediaMetaData>
#include <QMediaPlayer>
#include <QMimeData>
#include <QMimeDatabase>
#include <QStandardPaths>
#include <QTextBoundaryFinder>
#include <QVideoFrame>
#include <QVideoSink>
#include <QRegularExpression>
#include <mtx/responses/common.hpp>
@ -753,82 +753,80 @@ MediaUpload::MediaUpload(std::unique_ptr<QIODevice> source_,
QString::fromStdString(blurhash::encode(data_.data(), img.width(), img.height(), 4, 3));
} else if (mimeClass_ == u"video" || mimeClass_ == u"audio") {
auto mediaPlayer = new QMediaPlayer(this);
mediaPlayer->setAudioOutput(nullptr);
if (mimeClass_ == u"video") {
auto newSurface = new QVideoSink(this);
connect(
newSurface, &QVideoSink::videoFrameChanged, this, [this, mediaPlayer](const QVideoFrame& frame) {
QImage img = frame.toImage();
connect(newSurface,
&QVideoSink::videoFrameChanged,
this,
[this, mediaPlayer](const QVideoFrame &frame) {
QImage img = frame.toImage();
if (img.size().isEmpty())
return;
if (img.size().isEmpty())
return;
mediaPlayer->stop();
mediaPlayer->stop();
auto orientation = mediaPlayer->metaData().value(QMediaMetaData::Orientation).toInt();
if (orientation == 90 || orientation == 270 || orientation == 180) {
img =
img.transformed(QTransform().rotate(orientation), Qt::SmoothTransformation);
}
auto orientation =
mediaPlayer->metaData().value(QMediaMetaData::Orientation).toInt();
if (orientation == 90 || orientation == 270 || orientation == 180) {
img = img.transformed(QTransform().rotate(orientation),
Qt::SmoothTransformation);
}
nhlog::ui()->debug("Got image {}x{}", img.width(), img.height());
nhlog::ui()->debug("Got image {}x{}", img.width(), img.height());
this->setThumbnail(img);
this->setThumbnail(img);
if (!dimensions_.isValid())
this->dimensions_ = img.size();
if (!dimensions_.isValid())
this->dimensions_ = img.size();
if (img.height() > 200 && img.width() > 360)
img = img.scaled(360, 200, Qt::KeepAspectRatioByExpanding);
std::vector<unsigned char> data_;
for (int y = 0; y < img.height(); y++) {
for (int x = 0; x < img.width(); x++) {
auto p = img.pixel(x, y);
data_.push_back(static_cast<unsigned char>(qRed(p)));
data_.push_back(static_cast<unsigned char>(qGreen(p)));
data_.push_back(static_cast<unsigned char>(qBlue(p)));
}
}
blurhash_ = QString::fromStdString(
blurhash::encode(data_.data(), img.width(), img.height(), 4, 3));
});
if (img.height() > 200 && img.width() > 360)
img = img.scaled(360, 200, Qt::KeepAspectRatioByExpanding);
std::vector<unsigned char> data_;
for (int y = 0; y < img.height(); y++) {
for (int x = 0; x < img.width(); x++) {
auto p = img.pixel(x, y);
data_.push_back(static_cast<unsigned char>(qRed(p)));
data_.push_back(static_cast<unsigned char>(qGreen(p)));
data_.push_back(static_cast<unsigned char>(qBlue(p)));
}
}
blurhash_ = QString::fromStdString(
blurhash::encode(data_.data(), img.width(), img.height(), 4, 3));
});
mediaPlayer->setVideoOutput(newSurface);
}
connect(mediaPlayer,
&QMediaPlayer::error,
this,
[mediaPlayer]() {
nhlog::ui()->debug("Media player error {} and errorStr {}",
mediaPlayer->error(),
mediaPlayer->errorString().toStdString());
});
connect(mediaPlayer, &QMediaPlayer::errorChanged, this, [mediaPlayer]() {
nhlog::ui()->debug("Media player error {} and errorStr {}",
mediaPlayer->error(),
mediaPlayer->errorString().toStdString());
});
connect(mediaPlayer,
&QMediaPlayer::mediaStatusChanged,
[mediaPlayer](QMediaPlayer::MediaStatus status) {
nhlog::ui()->debug(
"Media player status {} and error {}", status, mediaPlayer->error());
});
connect(mediaPlayer,
&QMediaPlayer::metaDataChanged,
[this, mediaPlayer]() {
nhlog::ui()->debug("Got metadata");
connect(mediaPlayer, &QMediaPlayer::metaDataChanged, [this, mediaPlayer]() {
nhlog::ui()->debug("Got metadata");
if (mediaPlayer->duration() > 0)
this->duration_ = mediaPlayer->duration();
if (mediaPlayer->duration() > 0)
this->duration_ = mediaPlayer->duration();
auto dimensions = mediaPlayer->metaData().value(QMediaMetaData::Resolution).toSize();
if (!dimensions.isEmpty()) {
dimensions_ = dimensions;
auto orientation =
mediaPlayer->metaData().value(QMediaMetaData::Orientation).toInt();
if (orientation == 90 || orientation == 270) {
dimensions_.transpose();
}
}
});
auto dimensions = mediaPlayer->metaData().value(QMediaMetaData::Resolution).toSize();
if (!dimensions.isEmpty()) {
dimensions_ = dimensions;
auto orientation =
mediaPlayer->metaData().value(QMediaMetaData::Orientation).toInt();
if (orientation == 90 || orientation == 270) {
dimensions_.transpose();
}
}
});
connect(mediaPlayer, &QMediaPlayer::durationChanged, [this, mediaPlayer](qint64 duration) {
if (duration > 0) {
this->duration_ = mediaPlayer->duration();
@ -841,7 +839,7 @@ MediaUpload::MediaUpload(std::unique_ptr<QIODevice> source_,
auto originalFile = qobject_cast<QFile *>(source.get());
mediaPlayer->setSourceDevice(
source.get(), QUrl(originalFile ? originalFile->fileName() : originalFilename_) );
source.get(), QUrl(originalFile ? originalFile->fileName() : originalFilename_));
mediaPlayer->play();
}

21
src/ui/MxcMediaProxy.cpp
View file

@ -24,27 +24,20 @@ MxcMediaProxy::MxcMediaProxy(QObject *parent)
{
connect(this, &MxcMediaProxy::eventIdChanged, &MxcMediaProxy::startDownload);
connect(this, &MxcMediaProxy::roomChanged, &MxcMediaProxy::startDownload);
connect(this,
&MxcMediaProxy::error,
[this]() {
nhlog::ui()->info("Media player error {} and errorStr {}",
error(),
this->errorString().toStdString());
});
connect(this, &MxcMediaProxy::error, [this]() {
nhlog::ui()->info(
"Media player error {} and errorStr {}", error(), this->errorString().toStdString());
});
connect(this, &MxcMediaProxy::mediaStatusChanged, [this](QMediaPlayer::MediaStatus status) {
nhlog::ui()->info("Media player status {} and error {}", status, this->error());
});
connect(this,
&MxcMediaProxy::metaDataChanged,
[this]() {
emit orientationChanged();
});
connect(this, &MxcMediaProxy::metaDataChanged, [this]() { emit orientationChanged(); });
}
int
MxcMediaProxy::orientation() const
{
//nhlog::ui()->debug("metadata: {}", metaData().
// nhlog::ui()->debug("metadata: {}", metaData().
auto orientation = metaData().value(QMediaMetaData::Orientation).toInt();
nhlog::ui()->debug("Video orientation: {}", orientation);
return orientation;
@ -109,7 +102,7 @@ MxcMediaProxy::startDownload()
QTimer::singleShot(0, this, [this, filename] {
nhlog::ui()->info(
"Playing buffer with size: {}, {}", buffer.bytesAvailable(), buffer.isOpen());
this->setSourceDevice( &buffer, QUrl(filename.fileName()));
this->setSourceDevice(&buffer, QUrl(filename.fileName()));
emit loadedChanged();
});
};

4
src/ui/MxcMediaProxy.h
View file

@ -5,15 +5,15 @@
#pragma once
#include <QVideoSink>
#include <QBuffer>
#include <QMediaPlayer>
#include <QObject>
#include <QPointer>
#include <QString>
#include <QVideoSink>
#include "timeline/TimelineModel.h"
#include "Logging.h"
#include "timeline/TimelineModel.h"
class TimelineModel;

38
src/voip/CallManager.cpp
View file

@ -142,24 +142,21 @@ CallManager::CallManager(QObject *parent)
player_.play();
});
connect(&player_,
&QMediaPlayer::error,
this,
[this]() {
stopRingtone();
switch (player_.error()) {
case QMediaPlayer::FormatError:
case QMediaPlayer::ResourceError:
nhlog::ui()->error("WebRTC: valid ringtone file not found");
break;
case QMediaPlayer::AccessDeniedError:
nhlog::ui()->error("WebRTC: access to ringtone file denied");
break;
default:
nhlog::ui()->error("WebRTC: unable to play ringtone");
break;
}
});
connect(&player_, &QMediaPlayer::errorChanged, this, [this]() {
stopRingtone();
switch (player_.error()) {
case QMediaPlayer::FormatError:
case QMediaPlayer::ResourceError:
nhlog::ui()->error("WebRTC: valid ringtone file not found");
break;
case QMediaPlayer::AccessDeniedError:
nhlog::ui()->error("WebRTC: access to ringtone file denied");
break;
default:
nhlog::ui()->error("WebRTC: unable to play ringtone");
break;
}
});
}
void
@ -496,10 +493,9 @@ CallManager::retrieveTurnServer()
void
CallManager::playRingtone(const QUrl &ringtone, bool repeat)
{
player_.setLoops(repeat ? QMediaPlayer::Infinite :
1);
player_.setLoops(repeat ? QMediaPlayer::Infinite : 1);
player_.setSource(ringtone);
//player_.audioOutput()->setVolume(100);
// player_.audioOutput()->setVolume(100);
player_.play();
}