Comments (3)
joanbm
commented on August 18, 2024
I managed to build 1.6.6 again and found that:
-
The 'crash when clicking channels' issue is also there. Maybe this broke due to Qt or some other 3rd party upgrade.
-
The 'crash at exit' doesn't happen there. Running git bisect one reaches:
889deebcea8d45a5cca00a6a22397bb5b3ab4ef1 is the first bad commit
commit 889deebcea8d45a5cca00a6a22397bb5b3ab4ef1
Author: mrgreywater <[email protected]>
Date: Sun Nov 18 21:28:34 2018 +0100
refactor settings, choose player settings at runtime
appveyor.yml | 41 ++----
orion.pro | 5 +-
src/main.cpp | 66 +++++----
src/model/channelmanager.cpp | 10 +-
src/model/settingsmanager.cpp | 266 ++++++++++++++---------------------
src/model/settingsmanager.h | 100 +++++++++----
src/model/vodmanager.cpp | 3 +-
src/network/networkmanager.cpp | 1 +
src/qml/MpvBackend.qml | 17 ++-
src/qml/OptionsView.qml | 311 ++++++++++++++++++++++++++---------------
src/qml/PlayerView.qml | 50 ++-----
11 files changed, 465 insertions(+), 405 deletions(-)
from orion.
joanbm
commented on August 18, 2024
I figured most of it out.
For the crash when exiting, in multiple commits between 1.6.6 and 1.6.7, many objects that the application creates but are owned/released by Qt were converted from heap allocations to stack allocations. This causes Qt to attempt to release them at exit, which causes the crash.
Fix:
diff --git a/src/model/imageprovider.cpp b/src/model/imageprovider.cpp
index f9a24d2..3810dbb 100644
--- a/src/model/imageprovider.cpp
+++ b/src/model/imageprovider.cpp
@@ -26,7 +26,8 @@
const int ImageProvider::MSEC_PER_DOWNLOAD = 16; // ~ 256kbit/sec for 2k images
ImageProvider::ImageProvider(const QString imageProviderName, const QString extension, const QString cacheDirName) : QObject(),
- _cacheProvider(this), _imageProviderName(imageProviderName), _extension(extension) {
+ _imageProviderName(imageProviderName), _extension(extension) {
+ _cacheProvider = new CachedImageProvider(this);
activeDownloadCount = 0;
@@ -158,7 +159,7 @@ void ImageProvider::loadImageFile(QString emoteKey, QString filename) {
}
QQmlImageProviderBase * ImageProvider::getQMLImageProvider() {
- return &_cacheProvider;
+ return _cacheProvider;
}
bool ImageProvider::downloadsInProgress() const {
diff --git a/src/model/imageprovider.h b/src/model/imageprovider.h
index d398ee7..fab4271 100644
--- a/src/model/imageprovider.h
+++ b/src/model/imageprovider.h
@@ -100,7 +100,7 @@ private:
QNetworkAccessManager _manager;
friend class CachedImageProvider;
- CachedImageProvider _cacheProvider;
+ CachedImageProvider *_cacheProvider;
QHash<QString, QImage> _imageTable;
QString _imageProviderName;
diff --git a/src/model/settingsmanager.cpp b/src/model/settingsmanager.cpp
index 9f4bfd7..4112ecc 100644
--- a/src/model/settingsmanager.cpp
+++ b/src/model/settingsmanager.cpp
@@ -12,8 +12,10 @@ SettingsManager::SettingsManager(QObject *parent) :
SettingsManager *SettingsManager::getInstance()
{
- static SettingsManager instance;
- return &instance;
+ static SettingsManager *instance = nullptr;
+ if (instance == nullptr)
+ instance = new SettingsManager();
+ return instance;
}
void SettingsManager::load()
diff --git a/src/model/vodmanager.cpp b/src/model/vodmanager.cpp
index 958aa2a..a39edbe 100644
--- a/src/model/vodmanager.cpp
+++ b/src/model/vodmanager.cpp
@@ -41,15 +41,13 @@ VodManager::VodManager(QObject *parent) :
settings.endArray();
emit modelChanged();
-
- std::atexit([](){
- VodManager::getInstance()->saveSettings();
- });
}
VodManager *VodManager::getInstance() {
- static VodManager instance;
- return &instance;
+ static VodManager *instance = nullptr;
+ if (instance == nullptr)
+ instance = new VodManager();
+ return instance;
}
VodManager::~VodManager()
I did a quick test by counting ctor/dtor calls and even with this change all of CachedImageProvider, VodManager and SettingsManager are properly released at exit, there's no leak. Unless I'm missing something the call to std::atexit() can be safely removed since the settings are already saved at VodManager::~VodManager which happens at app. exit AFAICT.
For the crash when clicking channels I found that when a channel's description has emoji characters, it crashes. At first glance this looks like an upstream issue (Qt or similar). This can be used as a workaround:
diff --git a/src/qml/util.js b/src/qml/util.js
index 75f9a6a..7358805 100644
--- a/src/qml/util.js
+++ b/src/qml/util.js
@@ -19,7 +19,7 @@ function copyChannel(channel) {
_id: channel._id,
name: channel.name,
title: channel.title,
- info: channel.info,
+ info: channel.info.replace(/[^\x00-\x7F]/g, ""),
logo: channel.logo,
preview: channel.preview,
game: channel.game,
As an extra, for some reason hardware acceleration is working very slowly for me now, on an Intel iGPU I get ~5fps on 1080p60 videos with vaapi-copy. I think this is also an upstream issue (Intel drivers? mesa?) but I found that using the "gpu" backend (instead of the "libmpv" default backend) makes it work again. This makes the video play in a separate window as a side effect so it's not really something mergeable at this moment. Patch:
diff --git a/src/player/mpvobject.cpp b/src/player/mpvobject.cpp
index 31cdf73..f8ccfab 100644
--- a/src/player/mpvobject.cpp
+++ b/src/player/mpvobject.cpp
@@ -128,6 +128,8 @@ MpvObject::MpvObject(QQuickItem * parent)
#ifdef USE_OPENGL_CB
mpv_set_option_string(mpv, "vo", "opengl-cb");
+#else
+ mpv_set_option_string(mpv, "vo", "gpu");
#endif
if (mpv_initialize(mpv) < 0)
This makes Orion usable again for me.
from orion.
joanbm
commented on August 18, 2024
The emoji crash bug is a bug on Qt: [QTBUG-82311] Crash/Assert rendering text with emoji when style is set
from orion.
Related Issues (20)
- Open a specific channel via shortcut HOT 1
- Error getting stream / new pc version ? HOT 19
- Can't login (not hosting login response?) HOT 7
- The player in not working on ubuntu 18.04 LTS HOT 3
- QT_AUTO_SCREEN_SCALE_FACTOR has been deprecated in >=Qt Gui 5.14 HOT 3
- Login functionality broken HOT 1
- New release ? HOT 4
- CI fails HOT 1
- Please add network debugging HOT 1
- add an audio compressor?
- fails to build against latest mpv changes (<mpv/qthelper.hpp>) HOT 3
- Emotes fail to render when I type them, but do render when others type them
- ru.sh points to non-existent executable
- Registration issue?
- vod resume timecode doesn't update at times
- Cant use chat anymore. HOT 2
- searchViews do not fully populate on windows larger than 25 items.
- extreme gpu memory allocation with player set to mpv & hardware accel set to auto HOT 1
- Farewell
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from orion.