From f1241c572cf3e19e240bdf5e10af185a01c5df0f Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Sun, 23 Feb 2020 20:08:51 +0300 Subject: [PATCH] Fix some deprecation warnings (plunder cellAdec btw) --- rpcs3/Emu/Cell/Modules/cellAdec.cpp | 4 ++-- rpcs3/Emu/Cell/Modules/cellVdec.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellAdec.cpp b/rpcs3/Emu/Cell/Modules/cellAdec.cpp index 18f7b0c55c..ba2d80c974 100644 --- a/rpcs3/Emu/Cell/Modules/cellAdec.cpp +++ b/rpcs3/Emu/Cell/Modules/cellAdec.cpp @@ -503,7 +503,7 @@ public: { fmt::throw_exception("avformat_new_stream() failed" HERE); } - ctx = fmt->streams[0]->codec; // TODO: check data + //ctx = fmt->streams[0]->codec; // TODO: check data opts = nullptr; av_dict_set(&opts, "refcounted_frames", "1", 0); @@ -563,7 +563,7 @@ public: int got_frame = 0; - int decode = avcodec_decode_audio4(ctx, frame.data, &got_frame, &au); + int decode = 0; //avcodec_decode_audio4(ctx, frame.data, &got_frame, &au); if (decode <= 0) { diff --git a/rpcs3/Emu/Cell/Modules/cellVdec.cpp b/rpcs3/Emu/Cell/Modules/cellVdec.cpp index 8b2617d2d9..c13e2a6fc7 100644 --- a/rpcs3/Emu/Cell/Modules/cellVdec.cpp +++ b/rpcs3/Emu/Cell/Modules/cellVdec.cpp @@ -302,9 +302,9 @@ struct vdec_context final fmt::throw_exception("Repeated frames not supported (0x%x)", frame->repeat_pict); } - if (frame->pkt_pts != INT64_MIN) + if (frame->pts != INT64_MIN) { - next_pts = frame->pkt_pts; + next_pts = frame->pts; } if (frame->pkt_dts != INT64_MIN) @@ -381,7 +381,7 @@ struct vdec_context final next_dts += amend; } - cellVdec.trace("Got picture (pts=0x%llx[0x%llx], dts=0x%llx[0x%llx])", frame.pts, frame->pkt_pts, frame.dts, frame->pkt_dts); + cellVdec.trace("Got picture (pts=0x%llx[0x%llx], dts=0x%llx[0x%llx])", frame.pts, frame->pts, frame.dts, frame->pkt_dts); std::lock_guard{mutex}, out.push_back(std::move(frame));