X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=nageru%2Fvideo_encoder.cpp;h=2ac606ec5aea8674f1a31cc2ea763134d75deea4;hp=6344b8c6a04a89e0fe6e9e312999a2ad449ab93f;hb=bcd177e1daf5a63d7bf877bc5d30d8803dfd472c;hpb=392f9d1ccb835c05a3874c4bea163788b2c37024

diff --git a/nageru/video_encoder.cpp b/nageru/video_encoder.cpp
index 6344b8c..2ac606e 100644
--- a/nageru/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;
@@ -35,7 +35,7 @@ string generate_local_dump_filename(int frame)
 	localtime_r(&now, &now_tm);
 
 	char timestamp[64];
-	strftime(timestamp, sizeof(timestamp), "%F-%T%z", &now_tm);
+	strftime(timestamp, sizeof(timestamp), "%F-%H%M%S%z", &now_tm);
 
 	// Use the frame number to disambiguate between two cuts starting
 	// on the same second.
@@ -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::StreamID{ HTTPD::MAIN_STREAM, 0 }, 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::StreamID{ HTTPD::MAIN_STREAM, 0 }, (char *)buf, buf_size, type == AVIO_DATA_MARKER_SYNC_POINT, time, AVRational{ AV_TIME_BASE, 1 });
 	}
 	return buf_size;
 }