X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fquicksync_encoder.cpp;h=3b8886ffc815da55715a51f663e501e2b23a6490;hb=e9b870a8a0205a4450e097e0cec0ce70acdd7b71;hp=cc3818d336b0dd061f5a91f35a89c61a0e9ed405;hpb=af8007aa958271ba16b15e7d11a891570488f6c9;p=nageru

diff --git a/nageru/quicksync_encoder.cpp b/nageru/quicksync_encoder.cpp
index cc3818d..3b8886f 100644
--- a/nageru/quicksync_encoder.cpp
+++ b/nageru/quicksync_encoder.cpp
@@ -45,12 +45,12 @@ extern "C" {
 }  // namespace
 
 #include "audio_encoder.h"
-#include "context.h"
+#include "shared/context.h"
 #include "defs.h"
-#include "disk_space_estimator.h"
+#include "shared/disk_space_estimator.h"
 #include "shared/ffmpeg_raii.h"
 #include "flags.h"
-#include "mux.h"
+#include "shared/mux.h"
 #include "print_latency.h"
 #include "quicksync_encoder_impl.h"
 #include "ref_counted_frame.h"
@@ -1792,8 +1792,7 @@ void QuickSyncEncoderImpl::open_output_file(const std::string &filename)
 {
 	AVFormatContext *avctx = avformat_alloc_context();
 	avctx->oformat = av_guess_format(NULL, filename.c_str(), NULL);
-	assert(filename.size() < sizeof(avctx->filename) - 1);
-	strcpy(avctx->filename, filename.c_str());
+	avctx->url = strdup(filename.c_str());
 
 	string url = "file:" + filename;
 	int ret = avio_open2(&avctx->pb, url.c_str(), AVIO_FLAG_WRITE, &avctx->interrupt_callback, NULL);
@@ -1813,8 +1812,8 @@ void QuickSyncEncoderImpl::open_output_file(const std::string &filename)
 	{
 		lock_guard<mutex> lock(file_audio_encoder_mutex);
 		AVCodecParametersWithDeleter audio_codecpar = file_audio_encoder->get_codec_parameters();
-		file_mux.reset(new Mux(avctx, frame_width, frame_height, Mux::CODEC_H264, video_extradata, audio_codecpar.get(), TIMEBASE,
-			std::bind(&DiskSpaceEstimator::report_write, disk_space_estimator, filename, _1),
+		file_mux.reset(new Mux(avctx, frame_width, frame_height, Mux::CODEC_H264, video_extradata, audio_codecpar.get(), get_color_space(global_flags.ycbcr_rec709_coefficients), Mux::WITH_AUDIO, TIMEBASE,
+			std::bind(&DiskSpaceEstimator::report_append, disk_space_estimator, filename, _1),
 			Mux::WRITE_BACKGROUND,
 			{ &current_file_mux_metrics, &total_mux_metrics }));
 	}
@@ -1939,8 +1938,6 @@ void QuickSyncEncoderImpl::add_packet_for_uncompressed_frame(int64_t pts, int64_
 	stream_mux->add_packet(pkt, pts, pts);
 }
 
-namespace {
-
 void memcpy_with_pitch(uint8_t *dst, const uint8_t *src, size_t src_width, size_t dst_pitch, size_t height)
 {
 	if (src_width == dst_pitch) {
@@ -1954,8 +1951,6 @@ void memcpy_with_pitch(uint8_t *dst, const uint8_t *src, size_t src_width, size_
 	}
 }
 
-}  // namespace
-
 void QuickSyncEncoderImpl::pass_frame(QuickSyncEncoderImpl::PendingFrame frame, int display_frame_num, int64_t pts, int64_t duration)
 {
 	// Wait for the GPU to be done with the frame.