moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2026-06-17 14:11:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure FFmpeg log messages are written to the debug log

Browse Source
This commit is contained in:
Cameron Gutman
2018-09-07 15:53:10 -07:00
parent 529ac8041a
commit f1d117d5d7
1 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/main.cpp
+34 -3
View File
@@ -11,6 +11,10 @@
#define SDL_MAIN_HANDLED #define SDL_MAIN_HANDLED
#include <SDL.h> #include <SDL.h>
#ifdef HAVE_FFMPEG
#include "streaming/video/ffmpeg.h"
#endif
#include "path.h" #include "path.h"
#include "gui/computermodel.h" #include "gui/computermodel.h"
#include "gui/appmodel.h" #include "gui/appmodel.h"
@@ -62,7 +66,8 @@ void logToLoggerStream(QString& message)
} }
#endif #endif
s_LoggerStream << message << endl; s_LoggerStream << message;
s_LoggerStream.flush();
} }
void sdlLogToDiskHandler(void*, int category, SDL_LogPriority priority, const char* message) void sdlLogToDiskHandler(void*, int category, SDL_LogPriority priority, const char* message)
@@ -94,7 +99,7 @@ void sdlLogToDiskHandler(void*, int category, SDL_LogPriority priority, const ch
} }
QTime logTime = QTime::fromMSecsSinceStartOfDay(s_LoggerTime.elapsed()); QTime logTime = QTime::fromMSecsSinceStartOfDay(s_LoggerTime.elapsed());
QString txt = QString("%1 - SDL %2 (%3): %4").arg(logTime.toString()).arg(priorityTxt).arg(category).arg(message); QString txt = QString("%1 - SDL %2 (%3): %4\n").arg(logTime.toString()).arg(priorityTxt).arg(category).arg(message);
logToLoggerStream(txt); logToLoggerStream(txt);
} }
@@ -122,11 +127,32 @@ void qtLogToDiskHandler(QtMsgType type, const QMessageLogContext&, const QString
} }
QTime logTime = QTime::fromMSecsSinceStartOfDay(s_LoggerTime.elapsed()); QTime logTime = QTime::fromMSecsSinceStartOfDay(s_LoggerTime.elapsed());
QString txt = QString("%1 - Qt %2: %3").arg(logTime.toString()).arg(typeTxt).arg(msg); QString txt = QString("%1 - Qt %2: %3\n").arg(logTime.toString()).arg(typeTxt).arg(msg);
logToLoggerStream(txt); logToLoggerStream(txt);
} }
#ifdef HAVE_FFMPEG
void ffmpegLogToDiskHandler(void* ptr, int level, const char* fmt, va_list vl)
{
char lineBuffer[1024];
static int printPrefix = 1;
if ((level & 0xFF) > av_log_get_level()) {
return;
}
av_log_format_line(ptr, level, fmt, vl, lineBuffer, sizeof(lineBuffer), &printPrefix);
QTime logTime = QTime::fromMSecsSinceStartOfDay(s_LoggerTime.elapsed());
QString txt = QString("%1 - FFmpeg: %2").arg(logTime.toString()).arg(lineBuffer);
logToLoggerStream(txt);
}
#endif
#endif #endif
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
@@ -221,6 +247,11 @@ int main(int argc, char *argv[])
s_LoggerTime.start(); s_LoggerTime.start();
qInstallMessageHandler(qtLogToDiskHandler); qInstallMessageHandler(qtLogToDiskHandler);
SDL_LogSetOutputFunction(sdlLogToDiskHandler, nullptr); SDL_LogSetOutputFunction(sdlLogToDiskHandler, nullptr);
#ifdef HAVE_FFMPEG
av_log_set_callback(ffmpegLogToDiskHandler);
#endif
#endif #endif
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32