When doing a cut, do the shutdown in a separate thread.

[nageru] / x264_encoder.cpp

diff --git a/x264_encoder.cpp b/x264_encoder.cpp
index 189da20ad7f0c64f0fff92b044b324a957cf44e5..df9e9945e789370e639c8bdacc9c3d798c524900 100644 (file)
--- a/x264_encoder.cpp
+++ b/x264_encoder.cpp
@@ -13,8 +13,8 @@ extern "C" {
 
 using namespace std;
 
-X264Encoder::X264Encoder(Mux *mux)
-       : mux(mux)
+X264Encoder::X264Encoder(AVOutputFormat *oformat)
+       : wants_global_headers(oformat->flags & AVFMT_GLOBALHEADER)
 {
        frame_pool.reset(new uint8_t[WIDTH * HEIGHT * 2 * X264_QUEUE_LENGTH]);
        for (unsigned i = 0; i < X264_QUEUE_LENGTH; ++i) {
@@ -76,23 +76,51 @@ void X264Encoder::init_x264()
        param.vui.i_transfer = 2;  // Unspecified (since we use sRGB).
        param.vui.i_colmatrix = 6;  // BT.601/SMPTE 170M.
 
-       // 4.5 Mbit/sec, CBR.
+
        param.rc.i_rc_method = X264_RC_ABR;
-       param.rc.i_bitrate = 4500;
+       param.rc.i_bitrate = global_flags.x264_bitrate;
+       if (global_flags.x264_vbv_buffer_size < 0) {
+               param.rc.i_vbv_buffer_size = param.rc.i_bitrate;  // One-second VBV.
+       } else {
+               param.rc.i_vbv_buffer_size = global_flags.x264_vbv_buffer_size;
+       }
+       if (global_flags.x264_vbv_max_bitrate < 0) {
+               param.rc.i_vbv_max_bitrate = param.rc.i_bitrate;  // CBR.
+       } else {
+               param.rc.i_vbv_max_bitrate = global_flags.x264_vbv_max_bitrate;
+       }
 
-       // One-second VBV.
-       param.rc.i_vbv_max_bitrate = 4500;
-       param.rc.i_vbv_buffer_size = 4500;
+       // Occasionally players have problem with extremely low quantizers;
+       // be on the safe side. Shouldn't affect quality in any meaningful way.
+       param.rc.i_qp_min = 5;
 
        // TODO: more flags here, via x264_param_parse().
 
        x264_param_apply_profile(&param, "high");
 
+       param.b_repeat_headers = !wants_global_headers;
+
        x264 = x264_encoder_open(&param);
        if (x264 == nullptr) {
                fprintf(stderr, "ERROR: x264 initialization failed.\n");
                exit(1);
        }
+
+       if (wants_global_headers) {
+               x264_nal_t *nal;
+               int num_nal;
+
+               x264_encoder_headers(x264, &nal, &num_nal);
+
+               for (int i = 0; i < num_nal; ++i) {
+                       if (nal[i].i_type == NAL_SEI) {
+                               // Don't put the SEI in extradata; make it part of the first frame instead.
+                               buffered_sei += string((const char *)nal[i].p_payload, nal[i].i_payload);
+                       } else {
+                               global_headers += string((const char *)nal[i].p_payload, nal[i].i_payload);
+                       }
+               }
+       }
 }
 
 void X264Encoder::encoder_thread_func()
@@ -160,7 +188,7 @@ void X264Encoder::encode_frame(X264Encoder::QueuedFrame qf)
 
        // We really need one AVPacket for the entire frame, it seems,
        // so combine it all.
-       size_t num_bytes = 0;
+       size_t num_bytes = buffered_sei.size();
        for (int i = 0; i < num_nal; ++i) {
                num_bytes += nal[i].i_payload;
        }
@@ -168,6 +196,11 @@ void X264Encoder::encode_frame(X264Encoder::QueuedFrame qf)
        unique_ptr<uint8_t[]> data(new uint8_t[num_bytes]);
        uint8_t *ptr = data.get();
 
+       if (!buffered_sei.empty()) {
+               memcpy(ptr, buffered_sei.data(), buffered_sei.size());
+               ptr += buffered_sei.size();
+               buffered_sei.clear();
+       }
        for (int i = 0; i < num_nal; ++i) {
                memcpy(ptr, nal[i].p_payload, nal[i].i_payload);
                ptr += nal[i].i_payload;