Factor the basic metrics (memory, uptime, etc.) into a separate class, so that Kaeru...

[nageru] / kaeru.cpp

diff --git a/kaeru.cpp b/kaeru.cpp
index 5a86cdb1131b761971d6bdb7260ce68310ca7f03..efbb4f11341360863f7bc8383c7cce299bb45bea 100644 (file)
--- 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"
@@ -12,15 +13,22 @@
 
 #include <assert.h>
 #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)
 {
@@ -60,7 +68,8 @@ unique_ptr<Mux> create_mux(HTTPD *httpd, AVOutputFormat *oformat, X264Encoder *x
        unique_ptr<Mux> mux;
        int time_base = global_flags.stream_coarse_timebase ? COARSE_TIMEBASE : TIMEBASE;
        mux.reset(new Mux(avctx, global_flags.width, global_flags.height, Mux::CODEC_H264, video_extradata, audio_encoder->get_codec_parameters().get(), time_base,
-               /*write_callback=*/nullptr, Mux::WRITE_FOREGROUND, {}));
+               /*write_callback=*/nullptr, Mux::WRITE_FOREGROUND, { &stream_mux_metrics }));
+       stream_mux_metrics.init({{ "destination", "http" }});
        return mux;
 }
 
@@ -72,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.
@@ -117,6 +130,32 @@ void audio_frame_callback(Mux *mux, const AVPacket *pkt, AVRational timebase)
        mux->add_packet(*pkt, pkt->pts, pkt->dts == AV_NOPTS_VALUE ? pkt->pts : pkt->dts, timebase);
 }
 
+void adjust_bitrate(int signal)
+{
+       int new_bitrate = global_flags.x264_bitrate;
+       if (signal == SIGUSR1) {
+               new_bitrate += 100;
+               if (new_bitrate > 100000) {
+                       fprintf(stderr, "Ignoring SIGUSR1, can't increase bitrate below 100000 kbit/sec (currently at %d kbit/sec)\n",
+                               global_flags.x264_bitrate);
+               } else {
+                       fprintf(stderr, "Increasing bitrate to %d kbit/sec due to SIGUSR1.\n", new_bitrate);
+                       global_flags.x264_bitrate = new_bitrate;
+                       global_x264_encoder->change_bitrate(new_bitrate);
+               }
+       } else if (signal == SIGUSR2) {
+               new_bitrate -= 100;
+               if (new_bitrate < 100) {
+                       fprintf(stderr, "Ignoring SIGUSR1, can't decrease bitrate below 100 kbit/sec (currently at %d kbit/sec)\n",
+                               global_flags.x264_bitrate);
+               } else {
+                       fprintf(stderr, "Decreasing bitrate to %d kbit/sec due to SIGUSR1.\n", new_bitrate);
+                       global_flags.x264_bitrate = new_bitrate;
+                       global_x264_encoder->change_bitrate(new_bitrate);
+               }
+       }
+}
+
 int main(int argc, char *argv[])
 {
        parse_flags(PROGRAM_KAERU, argc, argv);
@@ -124,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();
@@ -148,6 +188,7 @@ int main(int argc, char *argv[])
                audio_encoder->add_mux(http_mux.get());
        }
        x264_encoder.add_mux(http_mux.get());
+       global_x264_encoder = &x264_encoder;
 
        FFmpegCapture video(argv[optind], global_flags.width, global_flags.height);
        video.set_pixel_format(FFmpegCapture::PixelFormat_NV12);
@@ -159,8 +200,13 @@ 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);
+       signal(SIGUSR2, adjust_bitrate);
+
        for ( ;; ) {
                sleep(3600);
        }