Add audio output when playing at 100% speed.

[nageru] / futatabi / video_stream.h

diff --git a/futatabi/video_stream.h b/futatabi/video_stream.h
index 26cb7c808a537af72d0f01cccbc4f0331185a912..f156be9af662578ee96cabec201f3337a08b09bc 100644 (file)
--- a/futatabi/video_stream.h
+++ b/futatabi/video_stream.h
@@ -47,23 +47,29 @@ public:
        void schedule_original_frame(std::chrono::steady_clock::time_point,
                                     int64_t output_pts, std::function<void()> &&display_func,
                                     QueueSpotHolder &&queue_spot_holder,
-                                    FrameOnDisk frame, const std::string &subtitle);
+                                    FrameOnDisk frame, const std::string &subtitle,
+                                    bool include_audio);
        void schedule_faded_frame(std::chrono::steady_clock::time_point, int64_t output_pts,
                                  std::function<void()> &&display_func,
                                  QueueSpotHolder &&queue_spot_holder,
                                  FrameOnDisk frame1, FrameOnDisk frame2,
-                                 float fade_alpha, const std::string &subtitle);
+                                 float fade_alpha, const std::string &subtitle);  // Always no audio.
        void schedule_interpolated_frame(std::chrono::steady_clock::time_point, int64_t output_pts,
                                         std::function<void(std::shared_ptr<Frame>)> &&display_func,
                                         QueueSpotHolder &&queue_spot_holder,
                                         FrameOnDisk frame1, FrameOnDisk frame2,
                                         float alpha, FrameOnDisk secondary_frame,  // Empty = no secondary (fade) frame.
-                                        float fade_alpha, const std::string &subtitle);
+                                        float fade_alpha, const std::string &subtitle,
+                                        bool include_audio);
        void schedule_refresh_frame(std::chrono::steady_clock::time_point, int64_t output_pts,
                                    std::function<void()> &&display_func,
-                                   QueueSpotHolder &&queue_spot_holder, const std::string &subtitle);
+                                   QueueSpotHolder &&queue_spot_holder, const std::string &subtitle);  // Always no audio.
+       void schedule_silence(std::chrono::steady_clock::time_point, int64_t output_pts,
+                             int64_t length_pts, QueueSpotHolder &&queue_spot_holder);
 
 private:
+       struct QueuedFrame;
+
        FrameReader frame_reader;
 
        void encode_thread_func();
@@ -72,6 +78,8 @@ private:
 
        static int write_packet2_thunk(void *opaque, uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time);
        int write_packet2(uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time);
+       void add_silence(int64_t pts, int64_t length_pts);
+       void add_audio_or_silence(const QueuedFrame &qf);
 
        // Allocated at the very start; if we're empty, we start dropping frames
        // (so that we don't build up an infinite interpolation backlog).
@@ -110,13 +118,13 @@ private:
                std::chrono::steady_clock::time_point local_pts;
 
                int64_t output_pts;
-               enum Type { ORIGINAL, FADED, INTERPOLATED, FADED_INTERPOLATED, REFRESH } type;
+               enum Type { ORIGINAL, FADED, INTERPOLATED, FADED_INTERPOLATED, REFRESH, SILENCE } type;
 
                // For original frames only. Made move-only so we know explicitly
                // we don't copy these ~200 kB files around inadvertedly.
                std::unique_ptr<std::string> encoded_jpeg;
 
-               // For everything except original frames.
+               // For everything except original frames and silence.
                FrameOnDisk frame1;
 
                // For fades only (including fades against interpolated frames).
@@ -135,6 +143,13 @@ private:
 
                std::string subtitle;  // Blank for none.
 
+               // Audio, in stereo interleaved 32-bit PCM. If empty and not of type SILENCE, one frame's worth of silence samples
+               // is synthesized.
+               std::string audio;
+
+               // For silence frames only.
+               int64_t silence_length_pts;
+
                QueueSpotHolder queue_spot_holder;
        };
        std::deque<QueuedFrame> frame_queue;  // Under <queue_lock>.