* Dump AVI output on every VI (fixes issue #4064).

* Add audio dumping (fixes issue #1638).


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7131 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
smelenchuk
2011-02-11 18:59:42 +00:00
parent ca78d3639b
commit b0fa0a83f8
13 changed files with 132 additions and 30 deletions

View File

@ -30,6 +30,8 @@
#include "CommonPaths.h"
#include "Log.h"
#include "HW/VideoInterface.h" //for TargetRefreshRate
HWND m_emuWnd;
LONG m_byteBuffer;
LONG m_frameCount;
@ -189,8 +191,7 @@ bool AVIDump::SetVideoFormat()
memset(&m_header, 0, sizeof(m_header));
m_header.fccType = streamtypeVIDEO;
m_header.dwScale = 1;
// TODO: Decect FPS using NTSC/PAL
m_header.dwRate = 60;
m_header.dwRate = VideoInterface::TargetRefreshRate;
m_header.dwSuggestedBufferSize = m_bitmap.biSizeImage;
return SUCCEEDED(AVIFileCreateStream(m_file, &m_stream, &m_header));
@ -202,6 +203,8 @@ bool AVIDump::SetVideoFormat()
#include "StringUtil.h"
#include "Log.h"
#include "HW/VideoInterface.h" //for TargetRefreshRate
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
@ -253,14 +256,14 @@ bool AVIDump::CreateFile()
return false;
}
s_Stream->codec->codec_id = s_FormatContext->oformat->video_codec;
s_Stream->codec->codec_id = CODEC_ID_FFV1; //s_FormatContext->oformat->video_codec;
s_Stream->codec->codec_type = AVMEDIA_TYPE_VIDEO;
s_Stream->codec->bit_rate = 400000;
s_Stream->codec->width = s_width;
s_Stream->codec->height = s_height;
s_Stream->codec->time_base = (AVRational){1, 30};
s_Stream->codec->time_base = (AVRational){1, VideoInterface::TargetRefreshRate};
s_Stream->codec->gop_size = 12;
s_Stream->codec->pix_fmt = PIX_FMT_YUV420P;
s_Stream->codec->pix_fmt = PIX_FMT_BGRA;
av_set_parameters(s_FormatContext, NULL);
@ -272,7 +275,7 @@ bool AVIDump::CreateFile()
}
if(!(s_SwsContext = sws_getContext(s_width, s_height, PIX_FMT_BGR24, s_width, s_height,
PIX_FMT_YUV420P, SWS_BICUBIC, NULL, NULL, NULL)))
PIX_FMT_BGRA, SWS_BICUBIC, NULL, NULL, NULL)))
{
CloseFile();
return false;
@ -281,10 +284,10 @@ bool AVIDump::CreateFile()
s_BGRFrame = avcodec_alloc_frame();
s_YUVFrame = avcodec_alloc_frame();
s_size = avpicture_get_size(PIX_FMT_YUV420P, s_width, s_height);
s_size = avpicture_get_size(PIX_FMT_BGRA, s_width, s_height);
s_YUVBuffer = new uint8_t[s_size];
avpicture_fill((AVPicture *)s_YUVFrame, s_YUVBuffer, PIX_FMT_YUV420P, s_width, s_height);
avpicture_fill((AVPicture *)s_YUVFrame, s_YUVBuffer, PIX_FMT_BGRA, s_width, s_height);
s_OutBuffer = new uint8_t[s_size];