Skip to content

Commit

Permalink
Merge pull request #14176 from unknownbrackets/ffmpeg-update
Browse files Browse the repository at this point in the history 
Remove deprecated API calls for new FFmpeg 4.3.x
  • Loading branch information
@hrydgard
hrydgard committed Feb 20, 2021
2 parents b77d47e + 54dd4e4 commit 8a69c3d
Show file tree
Hide file tree
Showing 5 changed files with 218 additions and 85 deletions.
158 changes: 97 additions & 61 deletions Core/AVIDump.cpp
View file
Expand Up @@ -44,11 +44,12 @@ extern "C" {
#define av_frame_free avcodec_free_frame
#endif

static AVFormatContext* s_format_context = nullptr;
static AVStream* s_stream = nullptr;
static AVFrame* s_src_frame = nullptr;
static AVFrame* s_scaled_frame = nullptr;
static SwsContext* s_sws_context = nullptr;
static AVFormatContext *s_format_context = nullptr;
static AVCodecContext *s_codec_context = nullptr;
static AVStream *s_stream = nullptr;
static AVFrame *s_src_frame = nullptr;
static AVFrame *s_scaled_frame = nullptr;
static SwsContext *s_sws_context = nullptr;

#endif

Expand All @@ -65,7 +66,9 @@ static void InitAVCodec() {
static bool first_run = true;
if (first_run) {
#ifdef USE_FFMPEG
#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 12, 100)
av_register_all();
#endif
#endif
first_run = false;
}
Expand All @@ -87,66 +90,84 @@ bool AVIDump::Start(int w, int h)

bool AVIDump::CreateAVI() {
#ifdef USE_FFMPEG
AVCodec* codec = nullptr;
AVCodec *codec = nullptr;

// Use gameID_EmulatedTimestamp for filename
std::string discID = g_paramSFO.GetDiscID();
std::string video_file_name = StringFromFormat("%s%s_%s.avi", GetSysDirectory(DIRECTORY_VIDEO).c_str(), discID.c_str(), KernelTimeNowFormatted().c_str()).c_str();

s_format_context = avformat_alloc_context();
std::stringstream s_file_index_str;
s_file_index_str << video_file_name;

snprintf(s_format_context->filename, sizeof(s_format_context->filename), "%s", s_file_index_str.str().c_str());
INFO_LOG(COMMON, "Recording Video to: %s", s_format_context->filename);
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(58, 7, 0)
char *filename = av_strdup(video_file_name.c_str());
// Freed when the context is freed.
s_format_context->url = filename;
#else
const char *filename = s_format_context->filename;
snprintf(s_format_context->filename, sizeof(s_format_context->filename), "%s", video_file_name.c_str());
#endif
INFO_LOG(COMMON, "Recording Video to: %s", filename);

// Make sure that the path exists
if (!File::Exists(GetSysDirectory(DIRECTORY_VIDEO)))
File::CreateDir(GetSysDirectory(DIRECTORY_VIDEO));

if (File::Exists(s_format_context->filename))
File::Delete(s_format_context->filename);
if (File::Exists(filename))
File::Delete(filename);

if (!(s_format_context->oformat = av_guess_format("avi", nullptr, nullptr)) || !(s_stream = avformat_new_stream(s_format_context, codec)))
{
s_format_context->oformat = av_guess_format("avi", nullptr, nullptr);
if (!s_format_context->oformat)
return false;
s_stream = avformat_new_stream(s_format_context, codec);
if (!s_stream)
return false;
}

s_stream->codec->codec_id = g_Config.bUseFFV1 ? AV_CODEC_ID_FFV1 : s_format_context->oformat->video_codec;
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 48, 101)
s_codec_context = s_stream->codec;
#else
s_codec_context = avcodec_alloc_context3(codec);
#endif
s_codec_context->codec_id = g_Config.bUseFFV1 ? AV_CODEC_ID_FFV1 : s_format_context->oformat->video_codec;
if (!g_Config.bUseFFV1)
s_stream->codec->codec_tag = MKTAG('X', 'V', 'I', 'D'); // Force XVID FourCC for better compatibility
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.num = 1001;
s_stream->codec->time_base.den = 60000;
s_stream->codec->gop_size = 12;
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)) || (avcodec_open2(s_stream->codec, codec, nullptr) < 0))
{
s_codec_context->codec_tag = MKTAG('X', 'V', 'I', 'D'); // Force XVID FourCC for better compatibility
s_codec_context->codec_type = AVMEDIA_TYPE_VIDEO;
s_codec_context->bit_rate = 400000;
s_codec_context->width = s_width;
s_codec_context->height = s_height;
s_codec_context->time_base.num = 1001;
s_codec_context->time_base.den = 60000;
s_codec_context->gop_size = 12;
s_codec_context->pix_fmt = g_Config.bUseFFV1 ? AV_PIX_FMT_BGRA : AV_PIX_FMT_YUV420P;

#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
if (avcodec_parameters_from_context(s_stream->codecpar, s_codec_context) < 0)
return false;
#endif

codec = avcodec_find_encoder(s_codec_context->codec_id);
if (!codec)
return false;
if (avcodec_open2(s_codec_context, codec, nullptr) < 0)
return false;
}

s_src_frame = av_frame_alloc();
s_scaled_frame = av_frame_alloc();

s_scaled_frame->format = s_stream->codec->pix_fmt;
s_scaled_frame->format = s_codec_context->pix_fmt;
s_scaled_frame->width = s_width;
s_scaled_frame->height = s_height;

#if LIBAVCODEC_VERSION_MAJOR >= 55
if (av_frame_get_buffer(s_scaled_frame, 1))
return false;
#else
if (avcodec_default_get_buffer(s_stream->codec, s_scaled_frame))
if (avcodec_default_get_buffer(s_codec_context, s_scaled_frame))
return false;
#endif

NOTICE_LOG(G3D, "Opening file %s for dumping", s_format_context->filename);
if (avio_open(&s_format_context->pb, s_format_context->filename, AVIO_FLAG_WRITE) < 0 || avformat_write_header(s_format_context, nullptr))
{
WARN_LOG(G3D, "Could not open %s", s_format_context->filename);
NOTICE_LOG(G3D, "Opening file %s for dumping", filename);
if (avio_open(&s_format_context->pb, filename, AVIO_FLAG_WRITE) < 0 || avformat_write_header(s_format_context, nullptr)) {
WARN_LOG(G3D, "Could not open %s", filename);
return false;
}

Expand All @@ -166,8 +187,7 @@ static void PreparePacket(AVPacket* pkt) {

#endif

void AVIDump::AddFrame()
{
void AVIDump::AddFrame() {
u32 w = 0;
u32 h = 0;
if (g_Config.bDumpVideoOutput) {
Expand All @@ -192,44 +212,60 @@ void AVIDump::AddFrame()
s_src_frame->height = s_height;

// Convert image from BGR24 to desired pixel format, and scale to initial width and height
if ((s_sws_context = sws_getCachedContext(s_sws_context, w, h, AV_PIX_FMT_RGB24, s_width, s_height, s_stream->codec->pix_fmt, SWS_BICUBIC, nullptr, nullptr, nullptr)))
{
if ((s_sws_context = sws_getCachedContext(s_sws_context, w, h, AV_PIX_FMT_RGB24, s_width, s_height, s_codec_context->pix_fmt, SWS_BICUBIC, nullptr, nullptr, nullptr))) {
sws_scale(s_sws_context, s_src_frame->data, s_src_frame->linesize, 0, h, s_scaled_frame->data, s_scaled_frame->linesize);
}

s_scaled_frame->format = s_stream->codec->pix_fmt;
s_scaled_frame->format = s_codec_context->pix_fmt;
s_scaled_frame->width = s_width;
s_scaled_frame->height = s_height;

// Encode and write the image.
AVPacket pkt;
PreparePacket(&pkt);
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
int error = avcodec_send_frame(s_codec_context, s_scaled_frame);
int got_packet = 0;
if (avcodec_receive_packet(s_codec_context, &pkt) >= 0) {
got_packet = 1;
}
#else
int got_packet;
int error = avcodec_encode_video2(s_stream->codec, &pkt, s_scaled_frame, &got_packet);
while (!error && got_packet)
{
int error = avcodec_encode_video2(s_codec_context, &pkt, s_scaled_frame, &got_packet);
#endif
while (error >= 0 && got_packet) {
// Write the compressed frame in the media file.
if (pkt.pts != (s64)AV_NOPTS_VALUE)
{
pkt.pts = av_rescale_q(pkt.pts, s_stream->codec->time_base, s_stream->time_base);
if (pkt.pts != (s64)AV_NOPTS_VALUE) {
pkt.pts = av_rescale_q(pkt.pts, s_codec_context->time_base, s_stream->time_base);
}
if (pkt.dts != (s64)AV_NOPTS_VALUE)
{
pkt.dts = av_rescale_q(pkt.dts, s_stream->codec->time_base, s_stream->time_base);
if (pkt.dts != (s64)AV_NOPTS_VALUE) {
pkt.dts = av_rescale_q(pkt.dts, s_codec_context->time_base, s_stream->time_base);
}
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 60, 100)
if (s_stream->codec->coded_frame->key_frame)
if (s_codec_context->coded_frame->key_frame)
pkt.flags |= AV_PKT_FLAG_KEY;
#endif
pkt.stream_index = s_stream->index;
av_interleaved_write_frame(s_format_context, &pkt);

// Handle delayed frames.
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
av_packet_unref(&pkt);
error = avcodec_receive_packet(s_codec_context, &pkt);
got_packet = error >= 0 ? 1 : 0;
#else
PreparePacket(&pkt);
error = avcodec_encode_video2(s_stream->codec, &pkt, nullptr, &got_packet);
error = avcodec_encode_video2(s_codec_context, &pkt, nullptr, &got_packet);
#endif
}
if (error)
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
av_packet_unref(&pkt);
if (error < 0 && error != AVERROR(EAGAIN) && error != AVERROR_EOF)
ERROR_LOG(G3D, "Error while encoding video: %d", error);
#else
if (error < 0)
ERROR_LOG(G3D, "Error while encoding video: %d", error);
#endif
#endif
delete[] flipbuffer;
}
Expand All @@ -246,18 +282,18 @@ void AVIDump::Stop() {

void AVIDump::CloseFile() {
#ifdef USE_FFMPEG

if (s_stream)
{
if (s_stream->codec)
{
if (s_codec_context) {
#if LIBAVCODEC_VERSION_MAJOR < 55
avcodec_default_release_buffer(s_stream->codec, s_src_frame);
avcodec_default_release_buffer(s_codec_context, s_src_frame);
#endif
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
avcodec_free_context(&s_codec_context);
#else
avcodec_close(s_codec_context);
s_codec_context = nullptr;
#endif
avcodec_close(s_stream->codec);
}
av_freep(&s_stream);
}
av_freep(&s_stream);

av_frame_free(&s_src_frame);
av_frame_free(&s_scaled_frame);
Expand Down
4 changes: 4 additions & 0 deletions Core/HLE/sceAtrac.cpp
View file
Expand Up @@ -636,8 +636,12 @@ void __AtracInit() {
atracIDTypes[5] = 0;

#ifdef USE_FFMPEG
#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 18, 100)
avcodec_register_all();
#endif
#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 12, 100)
av_register_all();
#endif
#endif // USE_FFMPEG
}

Expand Down
31 changes: 28 additions & 3 deletions Core/HLE/sceMpeg.cpp
View file
Expand Up @@ -393,9 +393,13 @@ void __MpegInit() {
actionPostPut = __KernelRegisterActionType(PostPutAction::Create);

#ifdef USE_FFMPEG
#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 18, 100)
avcodec_register_all();
#endif
#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 12, 100)
av_register_all();
#endif
#endif
}

void __MpegDoState(PointerWrap &p) {
Expand Down Expand Up @@ -989,7 +993,21 @@ static bool decodePmpVideo(PSPPointer<SceMpegRingBuffer> ringbuffer, u32 pmpctxA


// decode video frame
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
avcodec_send_packet(pCodecCtx, &packet);
int len = avcodec_receive_frame(pCodecCtx, pFrame);
if (len == 0) {
len = pFrame->pkt_size;
got_picture = 1;
} else if (len == AVERROR(EAGAIN)) {
len = 0;
got_picture = 0;
} else {
got_picture = 0;
}
#else
int len = avcodec_decode_video2(pCodecCtx, pFrame, &got_picture, &packet);
#endif
DEBUG_LOG(ME, "got_picture %d", got_picture);
if (got_picture){
SwsContext *img_convert_ctx = NULL;
Expand Down Expand Up @@ -1019,10 +1037,17 @@ static bool decodePmpVideo(PSPPointer<SceMpegRingBuffer> ringbuffer, u32 pmpctxA
sws_freeContext(img_convert_ctx);

// update timestamp
if (av_frame_get_best_effort_timestamp(mediaengine->m_pFrame) != AV_NOPTS_VALUE)
mediaengine->m_videopts = av_frame_get_best_effort_timestamp(mediaengine->m_pFrame) + av_frame_get_pkt_duration(mediaengine->m_pFrame) - mediaengine->m_firstTimeStamp;
#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(55, 58, 100)
int64_t bestPts = mediaengine->m_pFrame->best_effort_timestamp;
int64_t ptsDuration = mediaengine->m_pFrame->pkt_duration;
#else
int64_t bestPts = av_frame_get_best_effort_timestamp(mediaengine->m_pFrame);
int64_t ptsDuration = av_frame_get_pkt_duration(mediaengine->m_pFrame);
#endif
if (bestPts != AV_NOPTS_VALUE)
mediaengine->m_videopts = bestPts + ptsDuration - mediaengine->m_firstTimeStamp;
else
mediaengine->m_videopts += av_frame_get_pkt_duration(mediaengine->m_pFrame);
mediaengine->m_videopts += ptsDuration;

// push the decoded frame into pmp_queue
pmp_queue.push_back(pFrameRGB);
Expand Down

0 comments on commit 8a69c3d

Please sign in to comment.