fix(app): guard video_worker_loop PID ownership and assert pcm_sink output

This commit is contained in:
2026-11-19 14:23:17 -05:00
parent ff1a27e25b
commit db455a1b0d
2 changed files with 9 additions and 0 deletions

View File

@@ -1229,12 +1229,17 @@ void VideoPlayer::video_worker_loop(double start_pos_sec,
int status = 0;
if (!stopped_by_caller && natural_eof) {
bool owns_pid = false;
{
std::lock_guard<std::mutex> plock(proc_mutex_);
if (video_pid_ == child_pid) {
video_pid_ = -1;
owns_pid = true;
}
}
if (!owns_pid) {
return;
}
if (!media_detail::reap_pid_timeout(child_pid, 500, &status)) {
pid_t tmp = child_pid;
media_detail::kill_and_reap(tmp);

View File

@@ -718,6 +718,10 @@ void test_video_player_decodes_frames_seeks_and_handles_silent_mp4() {
}
std::this_thread::sleep_for(std::chrono::milliseconds(20));
}
assert(af.seq > 0);
assert(pcm_samples.load() > 0);
player.stop();
// Muted play(false) on audio MP4 skips pcm_sink and reaches EOF naturally
pcm_samples.store(0);
assert(player.open(audio_mp4, 226, 128));