Merge branch 'mjpeg'

[nageru] / nageru / quicksync_encoder.cpp

diff --git a/quicksync_encoder.cpp b/nageru/quicksync_encoder.cpp
similarity index 99%
rename from quicksync_encoder.cpp
rename to nageru/quicksync_encoder.cpp
index bca7ffd91983e73ed819d7889c9925cd58acae2f..b5d7c2d9dccf428665c954b161a57e6f76c3570c 100644 (file)
--- a/quicksync_encoder.cpp
+++ b/nageru/quicksync_encoder.cpp
@@ -45,16 +45,16 @@ extern "C" {
 }  // namespace
 
 #include "audio_encoder.h"
-#include "context.h"
+#include "shared/context.h"
 #include "defs.h"
-#include "disk_space_estimator.h"
-#include "ffmpeg_raii.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"
-#include "timebase.h"
+#include "shared/timebase.h"
 #include "x264_encoder.h"
 
 using namespace movit;
@@ -1813,8 +1813,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 }));
        }