mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-29 09:32:45 +00:00
Code Issues Projects Releases Wiki Activity

Avoid possible race in videoplayer

Browse Source
This commit is contained in:
Andrei Kortunov 2024-01-19 18:19:01 +04:00
parent 6ead5f9321
commit 8af8f331cb
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
extern/osg-ffmpeg-videoplayer/videostate.cpp vendored
View File

@ -598,8 +598,17 @@ public:
if(av_read_frame(pFormatCtx, packet.get()) < 0) if(av_read_frame(pFormatCtx, packet.get()) < 0)
{ {
if (self->audioq.nb_packets == 0 && self->videoq.nb_packets == 0 && self->pictq_size == 0) if (self->audioq.nb_packets == 0 && self->videoq.nb_packets == 0)
self->mVideoEnded = true; {
self->pictq_mutex.lock();
bool videoEnded = self->pictq_size == 0;
self->pictq_mutex.unlock();
if (videoEnded)
self->mVideoEnded = true;
else
std::this_thread::sleep_for(std::chrono::milliseconds(10));
}
continue; continue;
} }
else else