Move X264Encoder out of QuickSyncEncoder. This completes independent restart of the...

[nageru] / video_encoder.cpp

diff --git a/video_encoder.cpp b/video_encoder.cpp
index 8fd9723239f613345151fb11323371be19497728..25765291a890a3de3eb294ed236d4ff01d160899 100644 (file)
--- a/video_encoder.cpp
+++ b/video_encoder.cpp
@@ -9,6 +9,7 @@
 #include "httpd.h"
 #include "timebase.h"
 #include "quicksync_encoder.h"
+#include "x264_encoder.h"
 
 using namespace std;
 
@@ -38,8 +39,19 @@ VideoEncoder::VideoEncoder(QSurface *surface, const std::string &va_display, int
 {
        open_output_stream();
 
-       quicksync_encoder.reset(new QuickSyncEncoder(surface, va_display, width, height, stream_mux.get()));
-       quicksync_encoder->open_output_file(generate_local_dump_filename(/*frame=*/0).c_str());
+       if (global_flags.stream_audio_codec_name.empty()) {
+               stream_audio_encoder.reset(new AudioEncoder(AUDIO_OUTPUT_CODEC_NAME, DEFAULT_AUDIO_OUTPUT_BIT_RATE));
+       } else {
+               stream_audio_encoder.reset(new AudioEncoder(global_flags.stream_audio_codec_name, global_flags.stream_audio_codec_bitrate));
+       }
+       stream_audio_encoder->add_mux(stream_mux.get());
+
+       if (global_flags.x264_video_to_http) {
+               x264_encoder.reset(new X264Encoder(stream_mux.get()));
+       }
+
+       string filename = generate_local_dump_filename(/*frame=*/0);
+       quicksync_encoder.reset(new QuickSyncEncoder(filename, surface, va_display, width, height, stream_mux.get(), stream_audio_encoder.get(), x264_encoder.get()));
 }
 
 VideoEncoder::~VideoEncoder()
@@ -52,10 +64,8 @@ void VideoEncoder::do_cut(int frame)
 {
        string filename = generate_local_dump_filename(frame);
        printf("Starting new recording: %s\n", filename.c_str());
-       quicksync_encoder->close_output_file();
        quicksync_encoder->shutdown();
-       quicksync_encoder.reset(new QuickSyncEncoder(surface, va_display, width, height, stream_mux.get()));
-       quicksync_encoder->open_output_file(filename.c_str());
+       quicksync_encoder.reset(new QuickSyncEncoder(filename, surface, va_display, width, height, stream_mux.get(), stream_audio_encoder.get(), x264_encoder.get()));
 }
 
 void VideoEncoder::add_audio(int64_t pts, std::vector<float> audio)