X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=x264_encoder.cpp;h=66c06344f4ce7710919241be4d9dd9e7d449b60c;hp=08f6c91af90b4dd0de977d6e08443458705c317f;hb=327534a3031a332423411c9599c741f2f81657df;hpb=c574aef4437253dcf0e6c1fed4c9cab1033b33f9 diff --git a/x264_encoder.cpp b/x264_encoder.cpp index 08f6c91..66c0634 100644 --- a/x264_encoder.cpp +++ b/x264_encoder.cpp @@ -7,7 +7,10 @@ #include #include #include +#include #include +#include +#include #include "defs.h" #include "flags.h" @@ -26,9 +29,22 @@ extern "C" { using namespace movit; using namespace std; using namespace std::chrono; +using namespace std::placeholders; namespace { +// X264Encoder can be restarted if --record-x264-video is set, so make these +// metrics global. +atomic metric_x264_queued_frames{0}; +atomic metric_x264_max_queued_frames{X264_QUEUE_LENGTH}; +atomic metric_x264_dropped_frames{0}; +atomic metric_x264_output_frames_i{0}; +atomic metric_x264_output_frames_p{0}; +atomic metric_x264_output_frames_b{0}; +Histogram metric_x264_crf; +LatencyHistogram x264_latency_histogram; +once_flag x264_metrics_inited; + void update_vbv_settings(x264_param_t *param) { if (global_flags.x264_bitrate == -1) { @@ -52,22 +68,25 @@ X264Encoder::X264Encoder(AVOutputFormat *oformat) : wants_global_headers(oformat->flags & AVFMT_GLOBALHEADER), dyn(load_x264_for_bit_depth(global_flags.x264_bit_depth)) { + call_once(x264_metrics_inited, [](){ + global_metrics.add("x264_queued_frames", &metric_x264_queued_frames, Metrics::TYPE_GAUGE); + global_metrics.add("x264_max_queued_frames", &metric_x264_max_queued_frames, Metrics::TYPE_GAUGE); + global_metrics.add("x264_dropped_frames", &metric_x264_dropped_frames); + global_metrics.add("x264_output_frames", {{ "type", "i" }}, &metric_x264_output_frames_i); + global_metrics.add("x264_output_frames", {{ "type", "p" }}, &metric_x264_output_frames_p); + global_metrics.add("x264_output_frames", {{ "type", "b" }}, &metric_x264_output_frames_b); + + metric_x264_crf.init_uniform(50); + global_metrics.add("x264_crf", &metric_x264_crf); + x264_latency_histogram.init("x264"); + }); + size_t bytes_per_pixel = global_flags.x264_bit_depth > 8 ? 2 : 1; frame_pool.reset(new uint8_t[global_flags.width * global_flags.height * 2 * bytes_per_pixel * X264_QUEUE_LENGTH]); for (unsigned i = 0; i < X264_QUEUE_LENGTH; ++i) { free_frames.push(frame_pool.get() + i * (global_flags.width * global_flags.height * 2 * bytes_per_pixel)); } encoder_thread = thread(&X264Encoder::encoder_thread_func, this); - - global_metrics.add("x264_queued_frames", &metric_x264_queued_frames, Metrics::TYPE_GAUGE); - global_metrics.add("x264_max_queued_frames", &metric_x264_max_queued_frames, Metrics::TYPE_GAUGE); - global_metrics.add("x264_dropped_frames", &metric_x264_dropped_frames); - global_metrics.add("x264_output_frames", {{ "type", "i" }}, &metric_x264_output_frames_i); - global_metrics.add("x264_output_frames", {{ "type", "p" }}, &metric_x264_output_frames_p); - global_metrics.add("x264_output_frames", {{ "type", "b" }}, &metric_x264_output_frames_b); - - metric_x264_crf.init_uniform(50); - global_metrics.add("x264_crf", &metric_x264_crf); } X264Encoder::~X264Encoder() @@ -136,7 +155,7 @@ void X264Encoder::init_x264() param.vui.i_vidformat = 5; // Unspecified. param.vui.b_fullrange = 0; param.vui.i_colorprim = 1; // BT.709. - param.vui.i_transfer = 2; // Unspecified (since we use sRGB). + param.vui.i_transfer = 13; // sRGB. if (global_flags.ycbcr_rec709_coefficients) { param.vui.i_colmatrix = 1; // BT.709. } else { @@ -313,43 +332,23 @@ void X264Encoder::encode_frame(X264Encoder::QueuedFrame qf) frames_being_encoded[qf.pts] = qf.received_ts; } - // See if we have a new bitrate to change to. - unsigned new_rate = new_bitrate_kbit.exchange(0); // Read and clear. - if (new_rate != 0) { - bitrate_override_func = [new_rate](x264_param_t *param) { - param->rc.i_bitrate = new_rate; - update_vbv_settings(param); - }; - } - - auto ycbcr_coefficients_override_func = [qf](x264_param_t *param) { - if (qf.ycbcr_coefficients == YCBCR_REC_709) { - param->vui.i_colmatrix = 1; // BT.709. - } else { - assert(qf.ycbcr_coefficients == YCBCR_REC_601); - param->vui.i_colmatrix = 6; // BT.601/SMPTE 170M. - } - }; - + unsigned new_rate = new_bitrate_kbit.load(); // Can be 0 for no change. if (speed_control) { - speed_control->set_config_override_function([this, ycbcr_coefficients_override_func](x264_param_t *param) { - if (bitrate_override_func) { - bitrate_override_func(param); - } - ycbcr_coefficients_override_func(param); - }); + speed_control->set_config_override_function(bind(&speed_control_override_func, new_rate, qf.ycbcr_coefficients, _1)); } else { x264_param_t param; dyn.x264_encoder_parameters(x264, ¶m); - if (bitrate_override_func) { - bitrate_override_func(¶m); - } - ycbcr_coefficients_override_func(¶m); + speed_control_override_func(new_rate, qf.ycbcr_coefficients, ¶m); dyn.x264_encoder_reconfig(x264, ¶m); } if (speed_control) { - speed_control->before_frame(float(free_frames.size()) / X264_QUEUE_LENGTH, X264_QUEUE_LENGTH, 1e6 * qf.duration / TIMEBASE); + float queue_fill_ratio; + { + lock_guard lock(mu); + queue_fill_ratio = float(free_frames.size()) / X264_QUEUE_LENGTH; + } + speed_control->before_frame(queue_fill_ratio, X264_QUEUE_LENGTH, 1e6 * qf.duration / TIMEBASE); } dyn.x264_encoder_encode(x264, &nal, &num_nal, input_pic, &pic); if (speed_control) { @@ -375,7 +374,7 @@ void X264Encoder::encode_frame(X264Encoder::QueuedFrame qf) static int frameno = 0; print_latency("Current x264 latency (video inputs → network mux):", received_ts, (pic.i_type == X264_TYPE_B || pic.i_type == X264_TYPE_BREF), - &frameno); + &frameno, &x264_latency_histogram); } else { assert(false); } @@ -417,3 +416,18 @@ void X264Encoder::encode_frame(X264Encoder::QueuedFrame qf) mux->add_packet(pkt, pic.i_pts, pic.i_dts); } } + +void X264Encoder::speed_control_override_func(unsigned bitrate_kbit, movit::YCbCrLumaCoefficients ycbcr_coefficients, x264_param_t *param) +{ + if (bitrate_kbit != 0) { + param->rc.i_bitrate = bitrate_kbit; + update_vbv_settings(param); + } + + if (ycbcr_coefficients == YCBCR_REC_709) { + param->vui.i_colmatrix = 1; // BT.709. + } else { + assert(ycbcr_coefficients == YCBCR_REC_601); + param->vui.i_colmatrix = 6; // BT.601/SMPTE 170M. + } +}