Unify httpd.cpp from Nageru and Futatabi (whitespace differences, and metrics support).

[nageru] / futatabi / video_stream.cpp

diff --git a/futatabi/video_stream.cpp b/futatabi/video_stream.cpp
index d425ed190b6fa3187a6f3311c3c980d7ff48c031..8738dc546fa85ab09742aaf882454c0389cef402 100644 (file)
--- a/futatabi/video_stream.cpp
+++ b/futatabi/video_stream.cpp
@@ -6,13 +6,13 @@ extern "C" {
 }
 
 #include "chroma_subsampler.h"
-#include "context.h"
+#include "shared/context.h"
 #include "flags.h"
 #include "flow.h"
-#include "httpd.h"
+#include "shared/httpd.h"
 #include "jpeg_frame_view.h"
 #include "movit/util.h"
-#include "mux.h"
+#include "shared/mux.h"
 #include "player.h"
 #include "util.h"
 #include "ycbcr_converter.h"
@@ -248,8 +248,9 @@ void VideoStream::start()
        string video_extradata;
 
        constexpr int width = 1280, height = 720;  // Doesn't matter for MJPEG.
-       stream_mux.reset(new Mux(avctx, width, height, video_codec, video_extradata, /*audio_codec_parameters=*/nullptr, COARSE_TIMEBASE,
-               /*write_callback=*/nullptr, Mux::WRITE_FOREGROUND, {}));
+       stream_mux.reset(new Mux(avctx, width, height, video_codec, video_extradata, /*audio_codec_parameters=*/nullptr,
+               AVCOL_SPC_BT709, Mux::WITHOUT_AUDIO,
+               COARSE_TIMEBASE, /*write_callback=*/nullptr, Mux::WRITE_FOREGROUND, {}));
 
 
        encode_thread = thread(&VideoStream::encode_thread_func, this);