emu-mirrors/ryujinx-final
Archived
0
0
Fork 0
Code Activity

ffmpeg: Redirect log output (#2266)

Browse source 
* ffmpeg: Redirect log output

* Remove leftover delegate

* Logging -> Log
This commit is contained in:
Ac_K 2021-05-05 23:30:29 +02:00 committed by GitHub
parent f0fe434bd8
commit 106512229e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Ryujinx.Common/Logging/LogClass.cs
View file

@ -9,6 +9,7 @@ namespace Ryujinx.Common.Logging
Cpu, Cpu,
Font, Font,
Emulation, Emulation,
FFmpeg,
Gpu, Gpu,
Hid, Hid,
Host1x, Host1x,

45
Ryujinx.Graphics.Nvdec.H264/FFmpegContext.cs
View file

@ -1,16 +1,25 @@
using FFmpeg.AutoGen; using FFmpeg.AutoGen;
using Ryujinx.Common.Logging;
using System; using System;
using System.Runtime.InteropServices;
namespace Ryujinx.Graphics.Nvdec.H264 namespace Ryujinx.Graphics.Nvdec.H264
{ {
unsafe class FFmpegContext : IDisposable unsafe class FFmpegContext : IDisposable
{ {
private readonly av_log_set_callback_callback _logFunc;
private readonly AVCodec* _codec; private readonly AVCodec* _codec;
private AVPacket* _packet; private AVPacket* _packet;
private AVCodecContext* _context; private AVCodecContext* _context;
public FFmpegContext() public FFmpegContext()
{ {
_logFunc = Log;
// Redirect log output
ffmpeg.av_log_set_level(ffmpeg.AV_LOG_MAX_OFFSET);
ffmpeg.av_log_set_callback(_logFunc);
_codec = ffmpeg.avcodec_find_decoder(AVCodecID.AV_CODEC_ID_H264); _codec = ffmpeg.avcodec_find_decoder(AVCodecID.AV_CODEC_ID_H264);
_context = ffmpeg.avcodec_alloc_context3(_codec); _context = ffmpeg.avcodec_alloc_context3(_codec);
@ -19,6 +28,42 @@ namespace Ryujinx.Graphics.Nvdec.H264
_packet = ffmpeg.av_packet_alloc(); _packet = ffmpeg.av_packet_alloc();
} }
private void Log(void* p0, int level, string format, byte* vl)
{
if (level > ffmpeg.av_log_get_level())
{
return;
}
int lineSize = 1024;
byte* lineBuffer = stackalloc byte[lineSize];
int printPrefix = 1;
ffmpeg.av_log_format_line(p0, level, format, vl, lineBuffer, lineSize, &printPrefix);
string line = Marshal.PtrToStringAnsi((IntPtr)lineBuffer).Trim();
switch (level)
{
case ffmpeg.AV_LOG_PANIC:
case ffmpeg.AV_LOG_FATAL:
case ffmpeg.AV_LOG_ERROR:
Logger.Error?.Print(LogClass.FFmpeg, line);
break;
case ffmpeg.AV_LOG_WARNING:
Logger.Warning?.Print(LogClass.FFmpeg, line);
break;
case ffmpeg.AV_LOG_INFO:
Logger.Info?.Print(LogClass.FFmpeg, line);
break;
case ffmpeg.AV_LOG_VERBOSE:
case ffmpeg.AV_LOG_DEBUG:
case ffmpeg.AV_LOG_TRACE:
Logger.Debug?.Print(LogClass.FFmpeg, line);
break;
}
}
public int DecodeFrame(Surface output, ReadOnlySpan<byte> bitstream) public int DecodeFrame(Surface output, ReadOnlySpan<byte> bitstream)
{ {
// Ensure the packet is clean before proceeding // Ensure the packet is clean before proceeding