Make multitrack export include audio.

[nageru] / futatabi / video_stream.cpp

diff --git a/futatabi/video_stream.cpp b/futatabi/video_stream.cpp
index 4b0336ce3b8384a68673e7a5cf6fd7a0f603e9b2..06acfd2601a43ebe4ff17af8b0f7fffee788fc25 100644 (file)
--- a/futatabi/video_stream.cpp
+++ b/futatabi/video_stream.cpp
@@ -335,6 +335,8 @@ void VideoStream::schedule_original_frame(steady_clock::time_point local_pts,
 {
        fprintf(stderr, "output_pts=%" PRId64 "  original      input_pts=%" PRId64 "\n", output_pts, frame.pts);
 
+       // TODO: Write audio if at the right speed.
+
        QueuedFrame qf;
        qf.local_pts = local_pts;
        qf.type = QueuedFrame::ORIGINAL;
@@ -342,7 +344,7 @@ void VideoStream::schedule_original_frame(steady_clock::time_point local_pts,
        qf.display_func = move(display_func);
        qf.queue_spot_holder = move(queue_spot_holder);
        qf.subtitle = subtitle;
-       qf.encoded_jpeg.reset(new string(frame_reader.read_frame(frame)));
+       qf.encoded_jpeg.reset(new string(frame_reader.read_frame(frame, /*read_audio=*/false).video));
 
        lock_guard<mutex> lock(queue_lock);
        frame_queue.push_back(move(qf));