Factor out rewinding code in its own member function.

[nageru] / ffmpeg_capture.cpp

diff --git a/ffmpeg_capture.cpp b/ffmpeg_capture.cpp
index 77af9e654067f643ca411c7641ae11963a115414..e03382cec5418c8732bff8f0ecbc0d8346cb0544 100644 (file)
--- a/ffmpeg_capture.cpp
+++ b/ffmpeg_capture.cpp
@@ -78,7 +78,7 @@ void FFmpegCapture::start_bm_capture()
                return;
        }
        running = true;
-       producer_thread_should_quit = false;
+       producer_thread_should_quit.unquit();
        producer_thread = thread(&FFmpegCapture::producer_thread_func, this);
 }
 
@@ -88,7 +88,7 @@ void FFmpegCapture::stop_dequeue_thread()
                return;
        }
        running = false;
-       producer_thread_should_quit = true;
+       producer_thread_should_quit.quit();
        producer_thread.join();
 }
 
@@ -117,17 +117,17 @@ void FFmpegCapture::producer_thread_func()
        snprintf(thread_name, sizeof(thread_name), "FFmpeg_C_%d", card_index);
        pthread_setname_np(pthread_self(), thread_name);
 
-       while (!producer_thread_should_quit) {
+       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());
-                       sleep(1);
+                       producer_thread_should_quit.sleep_for(seconds(1));
                        continue;
                }
                if (!play_video(pathname)) {
                        // Error.
                        fprintf(stderr, "Error when playing %s, sleeping one second and trying again...\n", pathname.c_str());
-                       sleep(1);
+                       producer_thread_should_quit.sleep_for(seconds(1));
                        continue;
                }
 
@@ -189,16 +189,14 @@ bool FFmpegCapture::play_video(const string &pathname)
        unique_ptr<AVCodecContext, decltype(avcodec_close)*> codec_ctx_cleanup(
                codec_ctx.get(), avcodec_close);
 
-       int64_t pts_origin = 0, last_pts = 0;
-       steady_clock::time_point start = steady_clock::now();
-       steady_clock::time_point next_frame_start = start;
+       internal_rewind();
        double rate = 1.0;
 
        unique_ptr<SwsContext, decltype(sws_freeContext)*> sws_ctx(nullptr, sws_freeContext);
        int sws_last_width = -1, sws_last_height = -1;
 
        // Main loop.
-       while (!producer_thread_should_quit) {
+       while (!producer_thread_should_quit.should_quit()) {
                // Process any queued commands from other threads.
                vector<QueuedCommand> commands;
                {
@@ -211,8 +209,7 @@ bool FFmpegCapture::play_video(const string &pathname)
                                if (av_seek_frame(format_ctx.get(), /*stream_index=*/-1, /*timestamp=*/0, /*flags=*/0) < 0) {
                                        fprintf(stderr, "%s: Rewind failed, stopping play.\n", pathname.c_str());
                                }
-                               pts_origin = last_pts = 0;
-                               start = next_frame_start = steady_clock::now();
+                               internal_rewind();
                                break;
 
                        case QueuedCommand::CHANGE_RATE:
@@ -263,8 +260,7 @@ bool FFmpegCapture::play_video(const string &pathname)
                                fprintf(stderr, "%s: Rewind failed, not looping.\n", pathname.c_str());
                                return true;
                        }
-                       pts_origin = last_pts = 0;
-                       start = steady_clock::now();
+                       internal_rewind();
                        continue;
                }
 
@@ -307,11 +303,16 @@ bool FFmpegCapture::play_video(const string &pathname)
                 audio_format.bits_per_sample = 32;
                 audio_format.num_channels = 8;
 
-               // TODO: Make it interruptable somehow.
-               this_thread::sleep_until(next_frame_start);
+               producer_thread_should_quit.sleep_until(next_frame_start);
                frame_callback(timecode++,
                        video_frame, 0, video_format,
                        audio_frame, 0, audio_format);
        }
        return true;
 }
+
+void FFmpegCapture::internal_rewind()
+{                              
+       pts_origin = last_pts = 0;
+       start = next_frame_start = steady_clock::now();
+}