RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-05 06:26:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

cellRec: fix pausing and resuming

Browse source
This commit is contained in:
Megamouse 2023-11-22 01:21:05 +01:00
parent 966def13c5
commit 23316d4e1e
7 changed files with 98 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

46
rpcs3/Emu/Cell/Modules/cellRec.cpp
View file

@ -178,11 +178,30 @@ public:
std::lock_guard lock(m_mtx);
m_flush = flush;
m_paused = false;
m_frames_to_encode.clear();
m_samples_to_encode.clear();
has_error = false;
}
void pause(bool flush = true) override
{
cellRec.notice("Pausing video sink. flush=%d", flush);
std::lock_guard lock(m_mtx);
m_flush = flush;
m_paused = true;
}
void resume() override
{
cellRec.notice("Resuming video sink");
std::lock_guard lock(m_mtx);
m_flush = false;
m_paused = false;
}
encoder_frame get_frame()
{
std::lock_guard lock(m_mtx);
@ -563,7 +582,7 @@ void rec_info::start_video_provider()
const u64 pause_time_end = get_system_time();
ensure(pause_time_end > pause_time_start);
pause_time_total += (pause_time_end - pause_time_start);
video_provider.set_pause_time(pause_time_total / 1000);
video_provider.set_pause_time_us(pause_time_total);
cellRec.notice("Resuming video provider.");
return;
}
@ -573,7 +592,7 @@ void rec_info::start_video_provider()
recording_time_start = get_system_time();
pause_time_start = 0;
pause_time_total = 0;
video_provider.set_pause_time(0);
video_provider.set_pause_time_us(0);
video_provider_thread = std::make_unique<named_thread<std::function<void()>>>("cellRec video provider", [this]()
{
@ -785,7 +804,7 @@ void rec_info::start_video_provider()
void rec_info::pause_video_provider()
{
cellRec.notice("Pausing image provider.");
cellRec.notice("Pausing video provider.");
if (video_provider_thread)
{
@ -1393,20 +1412,14 @@ error_code cellRecStop()
sysutil_register_cb([&rec](ppu_thread& ppu) -> s32
{
// Disable video sink if it was used
if (rec.param.use_internal_video() || rec.param.use_internal_audio())
{
const recording_mode old_mode = g_recording_mode.exchange(recording_mode::stopped);
if (old_mode != recording_mode::cell && old_mode != recording_mode::stopped)
{
cellRec.error("cellRecStop: Unexpected recording mode %s found while stopping video capture. (ring_sec=%d)", old_mode, rec.param.ring_sec);
}
}
// cellRecStop actually just pauses the recording
rec.pause_video_provider();
if (rec.sink)
{
rec.sink->pause(true);
}
ensure(!!rec.encoder);
rec.encoder->pause(true);
@ -1465,6 +1478,11 @@ error_code cellRecStart()
rec.start_video_provider();
if (rec.sink)
{
rec.sink->resume();
}
if (rec.encoder->has_error)
{
rec.cb(ppu, CELL_REC_STATUS_ERR, CELL_REC_ERROR_FILE_OPEN, rec.cbUserData);