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 feec9da9a7c1739932393c83705adbea12a391c7..df9e9945e789370e639c8bdacc9c3d798c524900 100644 (file)
--- a/x264_encoder.cpp
+++ b/x264_encoder.cpp
@@ -78,7 +78,7 @@ void X264Encoder::init_x264()
 
 
        param.rc.i_rc_method = X264_RC_ABR;
-       param.rc.i_bitrate = global_flags.x264_vbv_max_bitrate;
+       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 {
@@ -90,6 +90,10 @@ void X264Encoder::init_x264()
                param.rc.i_vbv_max_bitrate = global_flags.x264_vbv_max_bitrate;
        }
 
+       // 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");