X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fmain.cpp;h=7c5f660ae5b97f928aed6b9c8daabe18a5744cc4;hb=c664eca0541eb9e813c0ead7fa596200eb51b45b;hp=edff307e38bd1a98584ef3c0a94d1e176f192538;hpb=7c111c0bfbe6bf54cfbce8ad67e0d9b150b3d195;p=nageru diff --git a/futatabi/main.cpp b/futatabi/main.cpp index edff307..7c5f660 100644 --- a/futatabi/main.cpp +++ b/futatabi/main.cpp @@ -1,5 +1,5 @@ -#include #include +#include #include #include #include @@ -21,16 +21,17 @@ extern "C" { } #include "clip_list.h" -#include "shared/context.h" #include "defs.h" -#include "shared/disk_space_estimator.h" -#include "shared/ffmpeg_raii.h" #include "flags.h" -#include "frame_on_disk.h" #include "frame.pb.h" -#include "shared/httpd.h" +#include "frame_on_disk.h" #include "mainwindow.h" #include "player.h" +#include "shared/context.h" +#include "shared/disk_space_estimator.h" +#include "shared/ffmpeg_raii.h" +#include "shared/httpd.h" +#include "shared/metrics.h" #include "shared/post_to_main_thread.h" #include "shared/ref_counted_gl_sync.h" #include "shared/timebase.h" @@ -39,8 +40,8 @@ extern "C" { #include #include -#include #include +#include #include #include @@ -51,7 +52,7 @@ constexpr char frame_magic[] = "Ftbifrm0"; constexpr size_t frame_magic_len = 8; mutex RefCountedGLsync::fence_lock; -atomic should_quit{false}; +atomic should_quit{ false }; int64_t start_pts = -1; @@ -69,6 +70,9 @@ mutex frame_mu; vector frames[MAX_STREAMS]; // Under frame_mu. vector frame_filenames; // Under frame_mu. +atomic metric_received_frames[MAX_STREAMS]{ { 0 } }; +Summary metric_received_frame_size_bytes; + namespace { FrameOnDisk write_frame(int stream_idx, int64_t pts, const uint8_t *data, size_t size, DB *db) @@ -76,7 +80,7 @@ FrameOnDisk write_frame(int stream_idx, int64_t pts, const uint8_t *data, size_t if (open_frame_files.count(stream_idx) == 0) { char filename[256]; snprintf(filename, sizeof(filename), "%s/frames/cam%d-pts%09ld.frames", - global_flags.working_directory.c_str(), stream_idx, pts); + global_flags.working_directory.c_str(), stream_idx, pts); FILE *fp = fopen(filename, "wb"); if (fp == nullptr) { perror(filename); @@ -141,7 +145,7 @@ FrameOnDisk write_frame(int stream_idx, int64_t pts, const uint8_t *data, size_t frames[stream_idx].push_back(frame); } - if (++file.frames_written_so_far >= 1000) { + if (++file.frames_written_so_far >= FRAMES_PER_FILE) { size_t size = ftell(file.fp); // Start a new file next time. @@ -178,12 +182,12 @@ FrameOnDisk write_frame(int stream_idx, int64_t pts, const uint8_t *data, size_t return frame; } -} // namespace +} // namespace HTTPD *global_httpd; void load_existing_frames(); -int record_thread_func(); +void record_thread_func(); int main(int argc, char **argv) { @@ -208,7 +212,9 @@ int main(int argc, char **argv) } avformat_network_init(); + global_metrics.set_prefix("futatabi"); global_httpd = new HTTPD; + global_metrics.remove("num_connected_multicam_clients"); QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts, true); @@ -249,6 +255,12 @@ int main(int argc, char **argv) load_existing_frames(); + for (int stream_idx = 0; stream_idx < MAX_STREAMS; ++stream_idx) { + if (!frames[stream_idx].empty()) { + assert(start_pts > frames[stream_idx].back().pts); + } + } + MainWindow main_window; main_window.show(); @@ -314,9 +326,9 @@ void load_frame_file(const char *filename, const string &basename, unsigned file // OK, found the magic. Try to parse the frame header. magic_offset = 0; - if (skipped_bytes > 0) { + if (skipped_bytes > 0) { fprintf(stderr, "WARNING: %s: Skipped %zu garbage bytes in the middle.\n", - filename, skipped_bytes); + filename, skipped_bytes); skipped_bytes = 0; } @@ -363,7 +375,7 @@ void load_frame_file(const char *filename, const string &basename, unsigned file if (skipped_bytes > 0) { fprintf(stderr, "WARNING: %s: Skipped %zu garbage bytes at the end.\n", - filename, skipped_bytes); + filename, skipped_bytes); } off_t size = ftell(fp); @@ -395,7 +407,7 @@ void load_existing_frames() } vector frame_basenames; - for ( ;; ) { + for (;;) { errno = 0; dirent *de = readdir(dir); if (de == nullptr) { @@ -445,17 +457,27 @@ void load_existing_frames() for (int stream_idx = 0; stream_idx < MAX_STREAMS; ++stream_idx) { sort(frames[stream_idx].begin(), frames[stream_idx].end(), - [](const auto &a, const auto &b) { return a.pts < b.pts; }); + [](const auto &a, const auto &b) { return a.pts < b.pts; }); } db.clean_unused_frame_files(frame_basenames); } -int record_thread_func() +void record_thread_func() { + for (unsigned i = 0; i < MAX_STREAMS; ++i) { + global_metrics.add("received_frames", { { "stream", to_string(i) } }, &metric_received_frames[i]); + } + global_metrics.add("received_frame_size_bytes", &metric_received_frame_size_bytes); + + if (global_flags.stream_source.empty() || global_flags.stream_source == "/dev/null") { + // Save the user from some repetitive messages. + return; + } + pthread_setname_np(pthread_self(), "ReceiveFrames"); - int64_t pts_offset; + int64_t pts_offset = 0; // Needs to be initialized due to a spurious GCC warning. DB db(global_flags.working_directory + "/futatabi.db"); while (!should_quit.load()) { @@ -470,7 +492,7 @@ int record_thread_func() while (!should_quit.load()) { AVPacket pkt; - unique_ptr pkt_cleanup( + unique_ptr pkt_cleanup( &pkt, av_packet_unref); av_init_packet(&pkt); pkt.data = nullptr; @@ -481,6 +503,12 @@ int record_thread_func() if (av_read_frame(format_ctx.get(), &pkt) != 0) { break; } + if (pkt.stream_index >= MAX_STREAMS) { + continue; + } + + ++metric_received_frames[pkt.stream_index]; + metric_received_frame_size_bytes.count_event(pkt.size); // Convert pts to our own timebase. AVRational stream_timebase = format_ctx->streams[pkt.stream_index]->time_base; @@ -507,10 +535,11 @@ int record_thread_func() current_pts = pts; } - fprintf(stderr, "%s: Hit EOF. Waiting one second and trying again...\n", global_flags.stream_source.c_str()); - sleep(1); + if (!should_quit.load()) { + fprintf(stderr, "%s: Hit EOF. Waiting one second and trying again...\n", global_flags.stream_source.c_str()); + sleep(1); + } start_pts = last_pts + TIMEBASE; } - return 0; }