Add audio output when playing at 100% speed.

[nageru] / futatabi / frame_on_disk.cpp

diff --git a/futatabi/frame_on_disk.cpp b/futatabi/frame_on_disk.cpp
index 6bdaf23a25569edb97d691a26ec1f3949dc792b1..f9a5639259be7a153777feb4ca76bded039d6185 100644 (file)
--- a/futatabi/frame_on_disk.cpp
+++ b/futatabi/frame_on_disk.cpp
@@ -4,6 +4,7 @@
 
 #include <atomic>
 #include <chrono>
+#include <assert.h>
 #include <fcntl.h>
 #include <mutex>
 #include <unistd.h>
@@ -68,8 +69,9 @@ string read_string(int fd, size_t size, off_t offset)
 
 }  // namespace
 
-FrameReader::Frame FrameReader::read_frame(FrameOnDisk frame, bool read_audio)
+FrameReader::Frame FrameReader::read_frame(FrameOnDisk frame, bool read_video, bool read_audio)
 {
+       assert(read_video || read_audio);
        steady_clock::time_point start = steady_clock::now();
 
        if (int(frame.filename_idx) != last_filename_idx) {
@@ -98,7 +100,9 @@ FrameReader::Frame FrameReader::read_frame(FrameOnDisk frame, bool read_audio)
        }
 
        Frame ret;
-       ret.video = read_string(fd, frame.size, frame.offset);
+       if (read_video) {
+               ret.video = read_string(fd, frame.size, frame.offset);
+       }
        if (read_audio) {
                ret.audio = read_string(fd, frame.audio_size, frame.offset + frame.size);
        }