X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=kaeru.cpp;h=efbb4f11341360863f7bc8383c7cce299bb45bea;hb=868450678563ed2c9fd5240dca704d87371d1478;hp=c41a4c2323dec4b21b8188575e9229f5d9bd8b31;hpb=b00233eece37776758b11bceac7ce0d9273be6e2;p=nageru

diff --git a/kaeru.cpp b/kaeru.cpp
index c41a4c2..efbb4f1 100644
--- a/kaeru.cpp
+++ b/kaeru.cpp
@@ -2,6 +2,7 @@
 // This is experimental code, not yet supported.
 
 #include "audio_encoder.h"
+#include "basic_stats.h"
 #include "defs.h"
 #include "flags.h"
 #include "ffmpeg_capture.h"
@@ -14,15 +15,19 @@
 #include <fcntl.h>
 #include <signal.h>
 #include <unistd.h>
+#include <chrono>
 #include <string>
 
 using namespace bmusb;
 using namespace movit;
 using namespace std;
+using namespace std::chrono;
 using namespace std::placeholders;
 
 Mixer *global_mixer = nullptr;
 X264Encoder *global_x264_encoder = nullptr;
+int frame_num = 0;
+BasicStats *global_basic_stats = nullptr;
 MuxMetrics stream_mux_metrics;
 
 int write_packet(void *opaque, uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time)
@@ -76,9 +81,13 @@ void video_frame_callback(FFmpegCapture *video, X264Encoder *x264_encoder, Audio
 	                  FrameAllocator::Frame audio_frame, size_t audio_offset, AudioFormat audio_format)
 {
 	if (video_pts >= 0 && video_frame.len > 0) {
+		ReceivedTimestamps ts;
+		ts.ts.push_back(steady_clock::now());
+
 		video_pts = av_rescale_q(video_pts, video_timebase, AVRational{ 1, TIMEBASE });
-		int64_t frame_duration = TIMEBASE * video_format.frame_rate_nom / video_format.frame_rate_den;
-		x264_encoder->add_frame(video_pts, frame_duration, video->get_current_frame_ycbcr_format().luma_coefficients, video_frame.data + video_offset, ReceivedTimestamps());
+		int64_t frame_duration = TIMEBASE * video_format.frame_rate_den / video_format.frame_rate_nom;
+		x264_encoder->add_frame(video_pts, frame_duration, video->get_current_frame_ycbcr_format().luma_coefficients, video_frame.data + video_offset, ts);
+		global_basic_stats->update(frame_num++, /*dropped_frames=*/0);
 	}
 	if (audio_frame.len > 0) {
 		// FFmpegCapture takes care of this for us.
@@ -154,6 +163,7 @@ int main(int argc, char *argv[])
 		usage(PROGRAM_KAERU);
 		exit(1);
 	}
+	global_flags.num_cards = 1;  // For latency metrics.
 
 	av_register_all();
 	avformat_network_init();
@@ -190,6 +200,8 @@ int main(int argc, char *argv[])
 	video.start_bm_capture();
 	video.change_rate(2.0);  // Be sure never to really fall behind, but also don't dump huge amounts of stuff onto x264.
 
+	BasicStats basic_stats(/*verbose=*/false);
+	global_basic_stats = &basic_stats;
 	httpd.start(9095);
 
 	signal(SIGUSR1, adjust_bitrate);