Make Futatabi accept and record the audio, although it cannot use it for anything...

[nageru] / futatabi / video_stream.h

diff --git a/futatabi/video_stream.h b/futatabi/video_stream.h
index 03f82d6fbb93d8ce96e12b1cdc5167108dec3971..26cb7c808a537af72d0f01cccbc4f0331185a912 100644 (file)
--- a/futatabi/video_stream.h
+++ b/futatabi/video_stream.h
@@ -111,7 +111,13 @@ private:
 
                int64_t output_pts;
                enum Type { ORIGINAL, FADED, INTERPOLATED, FADED_INTERPOLATED, REFRESH } type;
-               FrameOnDisk frame1;  // The only frame for original frames.
+
+               // 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.
+               FrameOnDisk frame1;
 
                // For fades only (including fades against interpolated frames).
                FrameOnDisk secondary_frame;
@@ -152,7 +158,7 @@ private:
        GLuint last_flow_tex = 0;
        FrameOnDisk last_frame1, last_frame2;
 
-       std::vector<uint8_t> last_frame;
+       std::string last_frame;
 };
 
 #endif  // !defined(_VIDEO_STREAM_H)