ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #362 from Tilka/ffmpeg_libav_new 

AVIDump: use new ffmpeg/libav API
This commit is contained in:
Dolphin Bot 2014-07-06 19:33:27 +02:00
parent 4ec8c3714d 6b3e6e6ffb
commit cc3dda5b22
4 changed files with 117 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -267,10 +267,6 @@ if(APPLE)
# page on x86_64 is 4GB in size. # page on x86_64 is 4GB in size.
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-pagezero_size,0x1000") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-pagezero_size,0x1000")
if(NOT DISABLE_WX)
add_definitions(-DUSE_WX -DHAVE_WX)
set(USE_WX TRUE)
endif()
find_library(APPKIT_LIBRARY AppKit) find_library(APPKIT_LIBRARY AppKit)
find_library(APPSERV_LIBRARY ApplicationServices) find_library(APPSERV_LIBRARY ApplicationServices)
find_library(ATB_LIBRARY AudioToolbox) find_library(ATB_LIBRARY AudioToolbox)

10
CMakeTests/CheckLib.cmake
View File

@ -55,17 +55,17 @@ endmacro()
macro(check_libav) macro(check_libav)
if(PKG_CONFIG_FOUND) if(PKG_CONFIG_FOUND)
pkg_check_modules(LIBAV libavcodec>=53.35.0 libavformat>=53.21.0 pkg_check_modules(LIBAV libavcodec>=55.52.102 libavformat>=55.33.100
libswscale>=2.1.0 libavutil>=51.22.1) libswscale>=2.5.102 libavutil>=52.66.100)
else() else()
message("pkg-config is required to check for libav") message("pkg-config is required to check for libav/ffmpeg")
endif() endif()
if(LIBAV_FOUND) if(LIBAV_FOUND)
message("libav found, enabling AVI frame dumps") message("libav/ffmpeg found, enabling AVI frame dumps")
add_definitions(-DHAVE_LIBAV) add_definitions(-DHAVE_LIBAV)
include_directories(${LIBAV_INCLUDE_DIRS}) include_directories(${LIBAV_INCLUDE_DIRS})
else() else()
message("libav not found, disabling AVI frame dumps") message("libav/ffmpeg not found, disabling AVI frame dumps")
endif() endif()
endmacro() endmacro()

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

@ -215,14 +215,15 @@ extern "C" {
#include <libavutil/mathematics.h> #include <libavutil/mathematics.h>
} }
AVFormatContext *s_FormatContext = nullptr; static AVFormatContext* s_format_context = nullptr;
AVStream *s_Stream = nullptr; static AVStream* s_stream = nullptr;
AVFrame *s_BGRFrame = nullptr, *s_YUVFrame = nullptr; static AVFrame* s_src_frame = nullptr;
uint8_t *s_YUVBuffer = nullptr; static AVFrame* s_scaled_frame = nullptr;
uint8_t *s_OutBuffer = nullptr; static uint8_t* s_yuv_buffer = nullptr;
int s_width; static SwsContext* s_sws_context = nullptr;
int s_height; static int s_width;
int s_size; static int s_height;
static int s_size;
static void InitAVCodec() static void InitAVCodec()
{ {
@ -240,143 +241,149 @@ bool AVIDump::Start(int w, int h)
s_height = h; s_height = h;
InitAVCodec(); InitAVCodec();
return CreateFile(); bool success = CreateFile();
if (!success)
CloseFile();
return success;
} }
bool AVIDump::CreateFile() bool AVIDump::CreateFile()
{ {
AVCodec *codec = nullptr; AVCodec* codec = nullptr;
s_FormatContext = avformat_alloc_context(); s_format_context = avformat_alloc_context();
snprintf(s_FormatContext->filename, sizeof(s_FormatContext->filename), "%s", snprintf(s_format_context->filename, sizeof(s_format_context->filename), "%s",
(File::GetUserPath(D_DUMPFRAMES_IDX) + "framedump0.avi").c_str()); (File::GetUserPath(D_DUMPFRAMES_IDX) + "framedump0.avi").c_str());
File::CreateFullPath(s_FormatContext->filename); File::CreateFullPath(s_format_context->filename);
if (!(s_FormatContext->oformat = av_guess_format("avi", nullptr, nullptr)) || if (!(s_format_context->oformat = av_guess_format("avi", nullptr, nullptr)) ||
!(s_Stream = avformat_new_stream(s_FormatContext, codec))) !(s_stream = avformat_new_stream(s_format_context, codec)))
{ {
CloseFile();
return false; return false;
} }
s_Stream->codec->codec_id = s_stream->codec->codec_id = g_Config.bUseFFV1 ? AV_CODEC_ID_FFV1
g_Config.bUseFFV1 ? CODEC_ID_FFV1 : s_FormatContext->oformat->video_codec; : s_format_context->oformat->video_codec;
s_Stream->codec->codec_type = AVMEDIA_TYPE_VIDEO; s_stream->codec->codec_type = AVMEDIA_TYPE_VIDEO;
s_Stream->codec->bit_rate = 400000; s_stream->codec->bit_rate = 400000;
s_Stream->codec->width = s_width; s_stream->codec->width = s_width;
s_Stream->codec->height = s_height; s_stream->codec->height = s_height;
s_Stream->codec->time_base = (AVRational){1, static_cast<int>(VideoInterface::TargetRefreshRate)}; s_stream->codec->time_base = (AVRational){1, static_cast<int>(VideoInterface::TargetRefreshRate)};
s_Stream->codec->gop_size = 12; s_stream->codec->gop_size = 12;
s_Stream->codec->pix_fmt = g_Config.bUseFFV1 ? PIX_FMT_BGRA : PIX_FMT_YUV420P; s_stream->codec->pix_fmt = g_Config.bUseFFV1 ? AV_PIX_FMT_BGRA : AV_PIX_FMT_YUV420P;
if (!(codec = avcodec_find_encoder(s_Stream->codec->codec_id)) || if (!(codec = avcodec_find_encoder(s_stream->codec->codec_id)) ||
(avcodec_open2(s_Stream->codec, codec, nullptr) < 0)) (avcodec_open2(s_stream->codec, codec, nullptr) < 0))
{ {
CloseFile();
return false; return false;
} }
s_BGRFrame = avcodec_alloc_frame(); s_src_frame = av_frame_alloc();
s_YUVFrame = avcodec_alloc_frame(); s_scaled_frame = av_frame_alloc();
s_size = avpicture_get_size(s_Stream->codec->pix_fmt, s_width, s_height); s_size = avpicture_get_size(s_stream->codec->pix_fmt, s_width, s_height);
s_YUVBuffer = new uint8_t[s_size]; s_yuv_buffer = new uint8_t[s_size];
avpicture_fill((AVPicture *)s_YUVFrame, s_YUVBuffer, s_Stream->codec->pix_fmt, s_width, s_height); avpicture_fill((AVPicture*)s_scaled_frame, s_yuv_buffer, s_stream->codec->pix_fmt, s_width, s_height);
s_OutBuffer = new uint8_t[s_size]; NOTICE_LOG(VIDEO, "Opening file %s for dumping", s_format_context->filename);
if (avio_open(&s_format_context->pb, s_format_context->filename, AVIO_FLAG_WRITE) < 0)
NOTICE_LOG(VIDEO, "Opening file %s for dumping", s_FormatContext->filename);
if (avio_open(&s_FormatContext->pb, s_FormatContext->filename, AVIO_FLAG_WRITE) < 0)
{ {
WARN_LOG(VIDEO, "Could not open %s", s_FormatContext->filename); WARN_LOG(VIDEO, "Could not open %s", s_format_context->filename);
CloseFile();
return false; return false;
} }
avformat_write_header(s_FormatContext, nullptr); avformat_write_header(s_format_context, nullptr);
return true; return true;
} }
static void PreparePacket(AVPacket* pkt)
{
av_init_packet(pkt);
pkt->data = nullptr;
pkt->size = 0;
if (s_stream->codec->coded_frame->pts != AV_NOPTS_VALUE)
{
pkt->pts = av_rescale_q(s_stream->codec->coded_frame->pts,
s_stream->codec->time_base, s_stream->time_base);
}
if (s_stream->codec->coded_frame->key_frame)
pkt->flags |= AV_PKT_FLAG_KEY;
pkt->stream_index = s_stream->index;
}
void AVIDump::AddFrame(const u8* data, int width, int height) void AVIDump::AddFrame(const u8* data, int width, int height)
{ {
avpicture_fill((AVPicture *)s_BGRFrame, const_cast<u8*>(data), PIX_FMT_BGR24, width, height); avpicture_fill((AVPicture*)s_src_frame, const_cast<u8*>(data), AV_PIX_FMT_BGR24, width, height);
// Convert image from BGR24 to desired pixel format, and scale to initial // Convert image from BGR24 to desired pixel format, and scale to initial
// width and height // width and height
struct SwsContext *s_SwsContext; if ((s_sws_context = sws_getCachedContext(s_sws_context,
if ((s_SwsContext = sws_getContext(width, height, PIX_FMT_BGR24, s_width, s_height, width, height, AV_PIX_FMT_BGR24,
s_Stream->codec->pix_fmt, SWS_BICUBIC, nullptr, nullptr, nullptr))) s_width, s_height, s_stream->codec->pix_fmt,
SWS_BICUBIC, nullptr, nullptr, nullptr)))
{ {
sws_scale(s_SwsContext, s_BGRFrame->data, s_BGRFrame->linesize, 0, sws_scale(s_sws_context, s_src_frame->data, s_src_frame->linesize, 0,
height, s_YUVFrame->data, s_YUVFrame->linesize); height, s_scaled_frame->data, s_scaled_frame->linesize);
sws_freeContext(s_SwsContext);
} }
// Encode and write the image // Encode and write the image.
int outsize = avcodec_encode_video(s_Stream->codec, s_OutBuffer, s_size, s_YUVFrame);
while (outsize > 0)
{
AVPacket pkt; AVPacket pkt;
av_init_packet(&pkt); PreparePacket(&pkt);
int got_packet;
int error = avcodec_encode_video2(s_stream->codec, &pkt, s_scaled_frame, &got_packet);
while (!error && got_packet)
{
// Write the compressed frame in the media file.
av_interleaved_write_frame(s_format_context, &pkt);
if (s_Stream->codec->coded_frame->pts != (unsigned int)AV_NOPTS_VALUE) // Handle delayed frames.
pkt.pts = av_rescale_q(s_Stream->codec->coded_frame->pts, PreparePacket(&pkt);
s_Stream->codec->time_base, s_Stream->time_base); error = avcodec_encode_video2(s_stream->codec, &pkt, nullptr, &got_packet);
if (s_Stream->codec->coded_frame->key_frame)
pkt.flags |= AV_PKT_FLAG_KEY;
pkt.stream_index = s_Stream->index;
pkt.data = s_OutBuffer;
pkt.size = outsize;
// Write the compressed frame in the media file
av_interleaved_write_frame(s_FormatContext, &pkt);
// Encode delayed frames
outsize = avcodec_encode_video(s_Stream->codec, s_OutBuffer, s_size, nullptr);
} }
if (error)
ERROR_LOG(VIDEO, "Error while encoding video: %d", error);
} }
void AVIDump::Stop() void AVIDump::Stop()
{ {
av_write_trailer(s_FormatContext); av_write_trailer(s_format_context);
CloseFile(); CloseFile();
NOTICE_LOG(VIDEO, "Stopping frame dump"); NOTICE_LOG(VIDEO, "Stopping frame dump");
} }
void AVIDump::CloseFile() void AVIDump::CloseFile()
{ {
if (s_Stream) if (s_stream)
{ {
if (s_Stream->codec) if (s_stream->codec)
avcodec_close(s_Stream->codec); avcodec_close(s_stream->codec);
av_free(s_Stream); av_free(s_stream);
s_Stream = nullptr; s_stream = nullptr;
} }
if (s_YUVBuffer) if (s_yuv_buffer)
delete[] s_YUVBuffer;
s_YUVBuffer = nullptr;
if (s_OutBuffer)
delete[] s_OutBuffer;
s_OutBuffer = nullptr;
if (s_BGRFrame)
av_free(s_BGRFrame);
s_BGRFrame = nullptr;
if (s_YUVFrame)
av_free(s_YUVFrame);
s_YUVFrame = nullptr;
if (s_FormatContext)
{ {
if (s_FormatContext->pb) delete[] s_yuv_buffer;
avio_close(s_FormatContext->pb); s_yuv_buffer = nullptr;
av_free(s_FormatContext); }
s_FormatContext = nullptr;
av_frame_free(&s_src_frame);
av_frame_free(&s_scaled_frame);
if (s_format_context)
{
if (s_format_context->pb)
avio_close(s_format_context->pb);
av_free(s_format_context);
s_format_context = nullptr;
}
if (s_sws_context)
{
sws_freeContext(s_sws_context);
s_sws_context = nullptr;
} }
} }

4
Source/Core/VideoCommon/AVIDump.h
View File

@ -14,14 +14,14 @@
class AVIDump class AVIDump
{ {
private: private:
static bool CreateFile(); static bool CreateFile();
static void CloseFile(); static void CloseFile();
static void SetBitmapFormat(); static void SetBitmapFormat();
static bool SetCompressionOptions(); static bool SetCompressionOptions();
static bool SetVideoFormat(); static bool SetVideoFormat();
public: public:
#ifdef _WIN32 #ifdef _WIN32
static bool Start(HWND hWnd, int w, int h); static bool Start(HWND hWnd, int w, int h);
#else #else