X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fvideo_encoder.cpp;h=8dee6da8307d47814f650302ad6d6ded2e78398e;hb=b280eea4c3fa09472595dd62538e036f2dbcaff5;hp=42247e9cd0bda138ca49a1615ee58acc7cdb66ab;hpb=b563b8903fa84bb7fd62d7d0b84b70cb26843dbf;p=nageru

diff --git a/nageru/video_encoder.cpp b/nageru/video_encoder.cpp
index 42247e9..8dee6da 100644
--- a/nageru/video_encoder.cpp
+++ b/nageru/video_encoder.cpp
@@ -15,10 +15,10 @@ extern "C" {
 #include "defs.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,8 @@ 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), COARSE_TIMEBASE,
 		/*write_callback=*/nullptr, Mux::WRITE_FOREGROUND, { &stream_mux_metrics }));
 	stream_mux_metrics.init({{ "destination", "http" }});
 }
@@ -216,9 +217,9 @@ int VideoEncoder::write_packet2(uint8_t *buf, int buf_size, AVIODataMarkerType t
 
 	if (type == AVIO_DATA_MARKER_HEADER) {
 		stream_mux_header.append((char *)buf, buf_size);
-		httpd->set_header(stream_mux_header);
+		httpd->set_header(HTTPD::MAIN_STREAM, stream_mux_header);
 	} else {
-		httpd->add_data((char *)buf, buf_size, type == AVIO_DATA_MARKER_SYNC_POINT, time, AVRational{ AV_TIME_BASE, 1 });
+		httpd->add_data(HTTPD::MAIN_STREAM, (char *)buf, buf_size, type == AVIO_DATA_MARKER_SYNC_POINT, time, AVRational{ AV_TIME_BASE, 1 });
 	}
 	return buf_size;
 }