Some manual line breaking.

diff --git a/video_stream.cpp b/video_stream.cpp
index 0ba8749de0574fd33db0f7d5620994343f0bea7c..49458f85811fb529129e4fa014b83f708395a8cf 100644 (file)
--- a/video_stream.cpp
+++ b/video_stream.cpp
@@ -288,7 +288,9 @@ void VideoStream::clear_queue()
        frame_queue.clear();
 }
 
-void VideoStream::schedule_original_frame(steady_clock::time_point local_pts, int64_t output_pts, function<void()> &&display_func, unsigned stream_idx, int64_t input_pts)
+void VideoStream::schedule_original_frame(steady_clock::time_point local_pts,
+                                          int64_t output_pts, function<void()> &&display_func,
+                                          unsigned stream_idx, int64_t input_pts)
 {
        fprintf(stderr, "output_pts=%ld  original      input_pts=%ld\n", output_pts, input_pts);
 
@@ -309,7 +311,10 @@ void VideoStream::schedule_original_frame(steady_clock::time_point local_pts, in
        queue_changed.notify_all();
 }
 
-bool VideoStream::schedule_faded_frame(steady_clock::time_point local_pts, int64_t output_pts, function<void()> &&display_func, unsigned stream_idx, int64_t input_pts, int secondary_stream_idx, int64_t secondary_input_pts, float fade_alpha)
+bool VideoStream::schedule_faded_frame(steady_clock::time_point local_pts, int64_t output_pts,
+                                       function<void()> &&display_func, unsigned stream_idx,
+                                       int64_t input_pts, int secondary_stream_idx,
+                                       int64_t secondary_input_pts, float fade_alpha)
 {
        fprintf(stderr, "output_pts=%ld  faded         input_pts=%ld,%ld  fade_alpha=%.2f\n", output_pts, input_pts, secondary_input_pts, fade_alpha);
 
@@ -383,7 +388,12 @@ bool VideoStream::schedule_faded_frame(steady_clock::time_point local_pts, int64
        return true;
 }
 
-bool VideoStream::schedule_interpolated_frame(steady_clock::time_point local_pts, int64_t output_pts, function<void()> &&display_func, unsigned stream_idx, int64_t input_first_pts, int64_t input_second_pts, float alpha, int secondary_stream_idx, int64_t secondary_input_pts, float fade_alpha)
+bool VideoStream::schedule_interpolated_frame(steady_clock::time_point local_pts,
+                                              int64_t output_pts, function<void()> &&display_func,
+                                              unsigned stream_idx, int64_t input_first_pts,
+                                              int64_t input_second_pts, float alpha,
+                                              int secondary_stream_idx, int64_t secondary_input_pts,
+                                              float fade_alpha)
 {
        if (secondary_stream_idx != -1) {
                fprintf(stderr, "output_pts=%ld  interpolated  input_pts1=%ld input_pts2=%ld alpha=%.3f  secondary_pts=%ld  fade_alpha=%.2f\n", output_pts, input_first_pts, input_second_pts, alpha, secondary_input_pts, fade_alpha);
@@ -500,7 +510,8 @@ bool VideoStream::schedule_interpolated_frame(steady_clock::time_point local_pts
        return true;
 }
 
-void VideoStream::schedule_refresh_frame(steady_clock::time_point local_pts, int64_t output_pts, function<void()> &&display_func)
+void VideoStream::schedule_refresh_frame(steady_clock::time_point local_pts,
+                                         int64_t output_pts, function<void()> &&display_func)
 {
        QueuedFrame qf;
        qf.type = QueuedFrame::REFRESH;

diff --git a/video_stream.h b/video_stream.h
index 64f72d8104d6aef219a6747e251b501bc4b29d16..8038c7b8ef1ee34ad768a7b1ca7345a998b17df8 100644 (file)
--- a/video_stream.h
+++ b/video_stream.h
@@ -41,10 +41,20 @@ public:
        // “display_func” is called after the frame has been calculated (if needed)
        // and has gone out to the stream. Returns false on failure (ie., couldn't
        // schedule the frame due to lack of resources).
-       void schedule_original_frame(std::chrono::steady_clock::time_point, int64_t output_pts, std::function<void()> &&display_func, unsigned stream_idx, int64_t input_pts);
-       bool schedule_faded_frame(std::chrono::steady_clock::time_point, int64_t output_pts, std::function<void()> &&display_func, unsigned stream_idx, int64_t input_pts, int secondary_stream_idx, int64_t secondary_input_pts, float fade_alpha);
-       bool schedule_interpolated_frame(std::chrono::steady_clock::time_point, int64_t output_pts, std::function<void()> &&display_func, unsigned stream_idx, int64_t input_first_pts, int64_t input_second_pts, float alpha, int secondary_stream_idx = -1, int64_t secondary_inputs_pts = -1, float fade_alpha = 0.0f);  // -1 = no secondary frame.
-       void schedule_refresh_frame(std::chrono::steady_clock::time_point, int64_t output_pts, std::function<void()> &&display_func);
+       void schedule_original_frame(std::chrono::steady_clock::time_point,
+                                    int64_t output_pts, std::function<void()> &&display_func,
+                                    unsigned stream_idx, int64_t input_pts);
+       bool schedule_faded_frame(std::chrono::steady_clock::time_point, int64_t output_pts,
+                                 std::function<void()> &&display_func, unsigned stream_idx,
+                                 int64_t input_pts, int secondary_stream_idx,
+                                 int64_t secondary_input_pts, float fade_alpha);
+       bool schedule_interpolated_frame(std::chrono::steady_clock::time_point, int64_t output_pts,
+                                 std::function<void()> &&display_func, unsigned stream_idx,
+                                 int64_t input_first_pts, int64_t input_second_pts, float alpha,
+                                 int secondary_stream_idx = -1, int64_t secondary_inputs_pts = -1,
+                                 float fade_alpha = 0.0f);  // -1 = no secondary frame.
+       void schedule_refresh_frame(std::chrono::steady_clock::time_point, int64_t output_pts,
+                                   std::function<void()> &&display_func);
 
 private:
        void encode_thread_func();