Add support for arbitrary x264 parameters.

[nageru] / video_encoder.cpp

diff --git a/video_encoder.cpp b/video_encoder.cpp
index 63a7ba3b1e315363e4888039ac48158770b3b4b8..eb1cd670e40c512904cf2e0c2389dfda37e785d1 100644 (file)
--- a/video_encoder.cpp
+++ b/video_encoder.cpp
@@ -50,7 +50,7 @@ VideoEncoder::VideoEncoder(ResourcePool *resource_pool, QSurface *surface, const
        }
 
        string filename = generate_local_dump_filename(/*frame=*/0);
-       quicksync_encoder.reset(new QuickSyncEncoder(filename, resource_pool, surface, va_display, width, height, oformat, stream_audio_encoder.get(), x264_encoder.get()));
+       quicksync_encoder.reset(new QuickSyncEncoder(filename, resource_pool, surface, va_display, width, height, oformat, x264_encoder.get()));
 
        open_output_stream();
        stream_audio_encoder->add_mux(stream_mux.get());
@@ -64,7 +64,6 @@ VideoEncoder::~VideoEncoder()
        while (quicksync_encoders_in_shutdown.load() > 0) {
                usleep(10000);
        }
-       close_output_stream();
 }
 
 void VideoEncoder::do_cut(int frame)
@@ -91,7 +90,7 @@ void VideoEncoder::do_cut(int frame)
                qs_needing_cleanup.emplace_back(old_encoder);
        }).detach();
 
-       quicksync_encoder.reset(new QuickSyncEncoder(filename, resource_pool, surface, va_display, width, height, oformat, stream_audio_encoder.get(), x264_encoder.get()));
+       quicksync_encoder.reset(new QuickSyncEncoder(filename, resource_pool, surface, va_display, width, height, oformat, x264_encoder.get()));
        quicksync_encoder->set_stream_mux(stream_mux.get());
 }
 
@@ -99,6 +98,7 @@ void VideoEncoder::add_audio(int64_t pts, std::vector<float> audio)
 {
        lock_guard<mutex> lock(qs_mu);
        quicksync_encoder->add_audio(pts, audio);
+       stream_audio_encoder->encode_audio(audio, pts + quicksync_encoder->global_delay());
 }
 
 bool VideoEncoder::begin_frame(GLuint *y_tex, GLuint *cbcr_tex)
@@ -144,11 +144,6 @@ void VideoEncoder::open_output_stream()
        stream_mux_header.clear();
 }
 
-void VideoEncoder::close_output_stream()
-{
-       stream_mux.reset();
-}
-
 int VideoEncoder::write_packet_thunk(void *opaque, uint8_t *buf, int buf_size)
 {
        VideoEncoder *video_encoder = (VideoEncoder *)opaque;