X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg_capture.cpp;h=b7db50c5513beea1376b70031d608cab6059c154;hb=4a300e3cab7b1b1ef5a32e1f4a7ec319c48e95e5;hp=c5f71b67a20a1848d2b346038c80f660d645328a;hpb=9e821958485d7f5845c3b24635df1f3243092e02;p=nageru diff --git a/ffmpeg_capture.cpp b/ffmpeg_capture.cpp index c5f71b6..b7db50c 100644 --- a/ffmpeg_capture.cpp +++ b/ffmpeg_capture.cpp @@ -208,7 +208,6 @@ YCbCrFormat decode_ycbcr_format(const AVPixFmtDescriptor *desc, const AVFrame *f FFmpegCapture::FFmpegCapture(const string &filename, unsigned width, unsigned height) : filename(filename), width(width), height(height), video_timebase{1, 1} { - // Not really used for anything. description = "Video: " + filename; last_frame = steady_clock::now(); @@ -283,9 +282,15 @@ void FFmpegCapture::producer_thread_func() pthread_setname_np(pthread_self(), thread_name); while (!producer_thread_should_quit.should_quit()) { - string pathname = search_for_file(filename); - if (filename.empty()) { - fprintf(stderr, "%s not found, sleeping one second and trying again...\n", filename.c_str()); + string filename_copy; + { + lock_guard lock(filename_mu); + filename_copy = filename; + } + + string pathname = search_for_file(filename_copy); + if (pathname.empty()) { + fprintf(stderr, "%s not found, sleeping one second and trying again...\n", filename_copy.c_str()); send_disconnected_frame(); producer_thread_should_quit.sleep_for(seconds(1)); continue;