Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix race condition in InternalFFMpegRegister initialization. #25419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 17, 2024
Merged

Fix race condition in InternalFFMpegRegister initialization. #25419

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8538314
Fix race condition in InternalFFMpegRegister initialization.
vrabaud Apr 16, 2024
53ec213
Move initLogger_() to the constructor.
vrabaud Apr 16, 2024
5eb2bdd
Drop comment
vrabaud Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/videoio/src/cap_ffmpeg_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,7 +927,6 @@ class InternalFFMpegRegister
if(!threadSafe)
lock.lock();
static InternalFFMpegRegister instance;
initLogger_(); // update logger setup unconditionally (GStreamer's libav plugin may override these settings)
Copy link
Contributor

@opencv-alalek opencv-alalek Apr 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I take a look on the comment.

It comes from this commit: 7baf2e8

which commit message says "repair FFmpeg logger settings on each .open() call"

@mshabunin Do you remember which reproducer we had for this case?

Copy link
Contributor

@mshabunin mshabunin Apr 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mshabunin Do you remember which reproducer we had for this case?

No, I don't 🙁
PR was #19661

}
static void initLogger_()
{
Expand Down Expand Up @@ -965,6 +964,7 @@ class InternalFFMpegRegister
/* register a callback function for synchronization */
av_lockmgr_register(&LockCallBack);
#endif
initLogger_();
}
~InternalFFMpegRegister()
{
Expand Down