piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3426 from Sonicadvance1/ES_fix_framedump

Browse Source 
Add support for framedumping to OpenGL ES.
This commit is contained in:
Ryan Houdek
2016-01-28 18:24:32 -05:00
parent 437b3db88e 3f15aa4b57
commit e1f21602fd
4 changed files with 66 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/VideoCommon/AVIDump.cpp
View File

@ -35,6 +35,7 @@ static AVFormatContext* s_format_context = nullptr;
static AVStream* s_stream = nullptr;
static AVFrame* s_src_frame = nullptr;
static AVFrame* s_scaled_frame = nullptr;
AVPixelFormat s_pix_fmt = AV_PIX_FMT_BGR24;
static uint8_t* s_yuv_buffer = nullptr;
static SwsContext* s_sws_context = nullptr;
static int s_width;
@ -54,8 +55,13 @@ static void InitAVCodec()
}
}
bool AVIDump::Start(int w, int h)
bool AVIDump::Start(int w, int h, DumpFormat format)
{
if (format == DumpFormat::FORMAT_BGR)
s_pix_fmt = AV_PIX_FMT_BGR24;
else
s_pix_fmt = AV_PIX_FMT_RGBA;
s_width = w;
s_height = h;
@ -147,12 +153,12 @@ static void PreparePacket(AVPacket* pkt)
void AVIDump::AddFrame(const u8* data, int width, int height)
{
avpicture_fill((AVPicture*)s_src_frame, const_cast<u8*>(data), AV_PIX_FMT_BGR24, width, height);
avpicture_fill((AVPicture*)s_src_frame, const_cast<u8*>(data), s_pix_fmt, width, height);
// Convert image from BGR24 to desired pixel format, and scale to initial
// Convert image from {BGR24, RGBA} to desired pixel format, and scale to initial
// width and height
if ((s_sws_context = sws_getCachedContext(s_sws_context,
width, height, AV_PIX_FMT_BGR24,
width, height, s_pix_fmt,
s_width, s_height, s_stream->codec->pix_fmt,
SWS_BICUBIC, nullptr, nullptr, nullptr)))
{