Merge branch 'mjpeg'

[nageru] / nageru / video_encoder.cpp

diff --git a/video_encoder.cpp b/nageru/video_encoder.cpp
similarity index 97%
rename from video_encoder.cpp
rename to nageru/video_encoder.cpp
index 2b8fcd5edec9e0a9ea3a79aed79d39d02494375d..bd93ae265369ec7076ee445c5bb38edb7f290298 100644 (file)
--- a/video_encoder.cpp
+++ b/nageru/video_encoder.cpp
@@ -13,12 +13,12 @@ extern "C" {
 
 #include "audio_encoder.h"
 #include "defs.h"
-#include "ffmpeg_raii.h"
+#include "shared/ffmpeg_raii.h"
 #include "flags.h"
-#include "httpd.h"
-#include "mux.h"
+#include "shared/httpd.h"
+#include "shared/mux.h"
 #include "quicksync_encoder.h"
-#include "timebase.h"
+#include "shared/timebase.h"
 #include "x264_encoder.h"
 
 class RefCountedFrame;
@@ -193,7 +193,9 @@ void VideoEncoder::open_output_stream()
                video_extradata = x264_encoder->get_global_headers();
        }
 
-       stream_mux.reset(new Mux(avctx, width, height, video_codec, video_extradata, stream_audio_encoder->get_codec_parameters().get(), COARSE_TIMEBASE,
+       stream_mux.reset(new Mux(avctx, width, height, video_codec, video_extradata, stream_audio_encoder->get_codec_parameters().get(),
+               get_color_space(global_flags.ycbcr_rec709_coefficients),
+               Mux::WITH_AUDIO, COARSE_TIMEBASE,
                /*write_callback=*/nullptr, Mux::WRITE_FOREGROUND, { &stream_mux_metrics }));
        stream_mux_metrics.init({{ "destination", "http" }});
 }