Make Video Decoding more stable

This commit is contained in:
Florian Märkl 2019-08-06 12:41:55 +02:00
commit 55002a4585
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
10 changed files with 116 additions and 18 deletions

35
gui/include/exception.h Normal file
View file

@ -0,0 +1,35 @@
/*
* This file is part of Chiaki.
*
* Chiaki is free 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.
*
* Chiaki 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 Chiaki. If not, see <https://www.gnu.org/licenses/>.
*/
#ifndef CHIAKI_EXCEPTION_H
#define CHIAKI_EXCEPTION_H
#include <exception>
#include <QString>
class Exception : public std::exception
{
private:
QString msg;
public:
explicit Exception(const QString &msg) : msg(msg) {}
const char *what() const noexcept override { return msg.toLocal8Bit().constData(); }
};
#endif // CHIAKI_EXCEPTION_H

View file

@ -19,6 +19,7 @@
#define CHIAKI_STREAMSESSION_H
#include "videodecoder.h"
#include "exception.h"
#include <QObject>
#include <QImage>
@ -33,14 +34,10 @@ class QAudioOutput;
class QIODevice;
class QKeyEvent;
class ChiakiException : public std::exception
class ChiakiException: public Exception
{
private:
QString msg;
public:
explicit ChiakiException(const QString &msg) : msg(msg) {}
const char *what() const noexcept override { return msg.toLocal8Bit().constData(); }
explicit ChiakiException(const QString &msg) : Exception(msg) {};
};
struct StreamSessionConnectInfo

View file

@ -18,6 +18,8 @@
#ifndef CHIAKI_VIDEODECODER_H
#define CHIAKI_VIDEODECODER_H
#include "exception.h"
#include <QMutex>
#include <QObject>
@ -28,6 +30,12 @@ extern "C"
#include <cstdint>
class VideoDecoderException: public Exception
{
public:
explicit VideoDecoderException(const QString &msg) : Exception(msg) {};
};
class VideoDecoder: public QObject
{
Q_OBJECT