X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=x264_encoder.cpp;h=f9b562443869211c8020731c94d9fe0701fd15a0;hb=498987ac24daccf573b385107540f12929eb89b2;hp=95d3625354c23ac539cb42917befcb5145c42e98;hpb=112ce67402abfb6163403697c8a4f0fb736101ca;p=nageru

diff --git a/x264_encoder.cpp b/x264_encoder.cpp
index 95d3625..f9b5624 100644
--- a/x264_encoder.cpp
+++ b/x264_encoder.cpp
@@ -1,5 +1,6 @@
 #include "x264_encoder.h"
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -10,6 +11,7 @@
 #include "defs.h"
 #include "flags.h"
 #include "mux.h"
+#include "print_latency.h"
 #include "timebase.h"
 #include "x264_speed_control.h"
 
@@ -19,6 +21,7 @@ extern "C" {
 }
 
 using namespace std;
+using namespace std::chrono;
 
 namespace {
 
@@ -55,11 +58,12 @@ X264Encoder::~X264Encoder()
 	encoder_thread.join();
 }
 
-void X264Encoder::add_frame(int64_t pts, int64_t duration, const uint8_t *data)
+void X264Encoder::add_frame(int64_t pts, int64_t duration, const uint8_t *data, const ReceivedTimestamps &received_ts)
 {
 	QueuedFrame qf;
 	qf.pts = pts;
 	qf.duration = duration;
+	qf.received_ts = received_ts;
 
 	{
 		lock_guard<mutex> lock(mu);
@@ -97,13 +101,16 @@ void X264Encoder::init_x264()
 		param.i_frame_reference = 16;  // Because speedcontrol is never allowed to change this above what we set at start.
 	}
 
-	// NOTE: These should be in sync with the ones in h264encode.cpp (sbs_rbsp()).
+	// NOTE: These should be in sync with the ones in quicksync_encoder.cpp (sps_rbsp()).
 	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_colmatrix = 6;  // BT.601/SMPTE 170M.
-
+	if (global_flags.ycbcr_rec709_coefficients) {
+		param.vui.i_colmatrix = 1;  // BT.709.
+	} else {
+		param.vui.i_colmatrix = 6;  // BT.601/SMPTE 170M.
+	}
 
 	param.rc.i_rc_method = X264_RC_ABR;
 	param.rc.i_bitrate = global_flags.x264_bitrate;
@@ -251,6 +258,8 @@ void X264Encoder::encode_frame(X264Encoder::QueuedFrame qf)
 		pic.opaque = reinterpret_cast<void *>(intptr_t(qf.duration));
 
 		input_pic = &pic;
+
+		frames_being_encoded[qf.pts] = qf.received_ts;
 	}
 
 	// See if we have a new bitrate to change to.
@@ -280,6 +289,18 @@ void X264Encoder::encode_frame(X264Encoder::QueuedFrame qf)
 
 	if (num_nal == 0) return;
 
+	if (frames_being_encoded.count(pic.i_pts)) {
+		ReceivedTimestamps received_ts = frames_being_encoded[pic.i_pts];
+		frames_being_encoded.erase(pic.i_pts);
+
+		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);
+	} else {
+		assert(false);
+	}
+
 	// We really need one AVPacket for the entire frame, it seems,
 	// so combine it all.
 	size_t num_bytes = buffered_sei.size();