X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fvideo_encoder.cpp;h=6749f3579f2fbe137819b6b976c872d580c3447a;hb=539609eb56b496e6eff8a5e0a92fa0325936a5d7;hp=6344b8c6a04a89e0fe6e9e312999a2ad449ab93f;hpb=392f9d1ccb835c05a3874c4bea163788b2c37024;p=nageru diff --git a/nageru/video_encoder.cpp b/nageru/video_encoder.cpp index 6344b8c..6749f35 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; @@ -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" }}); }