More shutdown issues with X264Encoder (still not fully there).

diff --git a/h264encode.cpp b/h264encode.cpp
index b9c52eb55e00914406fc73b131eb47657f13336f..50d90a19121004cf9b1c8a53b4846602e9940a34 100644 (file)
--- a/h264encode.cpp
+++ b/h264encode.cpp
@@ -304,6 +304,16 @@ private:
        vector<float> audio_queue_file;
        vector<float> audio_queue_stream;
 
+       unique_ptr<Mux> stream_mux;  // To HTTP.
+       unique_ptr<Mux> file_mux;  // To local disk.
+
+       // While Mux object is constructing, <stream_mux_writing_header> is true,
+       // and the header is being collected into stream_mux_header.
+       bool stream_mux_writing_header;
+       string stream_mux_header;
+
+       bool stream_mux_writing_keyframes = false;
+
        AVFrame *audio_frame = nullptr;
        HTTPD *httpd;
        unique_ptr<FrameReorderer> reorderer;
@@ -366,16 +376,6 @@ private:
        int frame_height;
        int frame_width_mbaligned;
        int frame_height_mbaligned;
-
-       unique_ptr<Mux> stream_mux;  // To HTTP.
-       unique_ptr<Mux> file_mux;  // To local disk.
-
-       // While Mux object is constructing, <stream_mux_writing_header> is true,
-       // and the header is being collected into stream_mux_header.
-       bool stream_mux_writing_header;
-       string stream_mux_header;
-
-       bool stream_mux_writing_keyframes = false;
 };
 
 // Supposedly vaRenderPicture() is supposed to destroy the buffer implicitly,
@@ -2094,6 +2094,7 @@ void H264EncoderImpl::shutdown()
                frame_queue_nonempty.notify_all();
        }
        encode_thread.join();
+       x264_encoder.reset();
        {
                unique_lock<mutex> lock(storage_task_queue_mutex);
                storage_thread_should_quit = true;