From e35786415c00652b3436dab5174c2504d314a219 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Tue, 4 Jul 2023 20:09:54 +0200 Subject: [PATCH] Rename stream_mux to http_mux. --- nageru/quicksync_encoder.cpp | 6 +++--- nageru/quicksync_encoder.h | 2 +- nageru/quicksync_encoder_impl.h | 6 +++--- nageru/video_encoder.cpp | 26 +++++++++++++------------- nageru/video_encoder.h | 6 +++--- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/nageru/quicksync_encoder.cpp b/nageru/quicksync_encoder.cpp index 328c2c6..0d0fbec 100644 --- a/nageru/quicksync_encoder.cpp +++ b/nageru/quicksync_encoder.cpp @@ -1352,7 +1352,7 @@ void QuickSyncEncoderImpl::save_codeddata(GLSurface *surf, storage_task task) } if (!global_flags.x264_video_to_http && !global_flags.av1_video_to_http) { - stream_mux->add_packet(pkt, task.pts + global_delay(), task.dts + global_delay()); + http_mux->add_packet(pkt, task.pts + global_delay(), task.dts + global_delay()); } } } @@ -2045,9 +2045,9 @@ void QuickSyncEncoder::close_file() impl->shutdown(); } -void QuickSyncEncoder::set_stream_mux(Mux *mux) +void QuickSyncEncoder::set_http_mux(Mux *mux) { - impl->set_stream_mux(mux); + impl->set_http_mux(mux); } int64_t QuickSyncEncoder::global_delay() const { diff --git a/nageru/quicksync_encoder.h b/nageru/quicksync_encoder.h index 9f59c2c..6c27cfb 100644 --- a/nageru/quicksync_encoder.h +++ b/nageru/quicksync_encoder.h @@ -66,7 +66,7 @@ public: QuickSyncEncoder(const std::string &filename, movit::ResourcePool *resource_pool, QSurface *surface, const std::string &va_display, int width, int height, const AVOutputFormat *oformat, VideoCodecInterface *http_encoder, VideoCodecInterface *disk_encoder, DiskSpaceEstimator *disk_space_estimator); ~QuickSyncEncoder(); - void set_stream_mux(Mux *mux); // Does not take ownership. Must be called unless x264 is used for the stream. + void set_http_mux(Mux *mux); // Does not take ownership. Must be called unless x264 is used for the stream. void add_audio(int64_t pts, std::vector audio); // Thread-safe. bool is_zerocopy() const; // Thread-safe. diff --git a/nageru/quicksync_encoder_impl.h b/nageru/quicksync_encoder_impl.h index c40567c..ee8ec47 100644 --- a/nageru/quicksync_encoder_impl.h +++ b/nageru/quicksync_encoder_impl.h @@ -52,9 +52,9 @@ public: void shutdown(); void close_file(); void release_gl_resources(); - void set_stream_mux(Mux *mux) + void set_http_mux(Mux *mux) { - stream_mux = mux; + http_mux = mux; } // So we never get negative dts. @@ -174,7 +174,7 @@ private: VideoCodecInterface *disk_encoder; std::unique_ptr v4l_output; // nullptr if not using V4L2 output. - Mux* stream_mux = nullptr; // To HTTP. + Mux* http_mux = nullptr; // To the HTTP server. std::unique_ptr file_mux; // To local disk. // Encoder parameters diff --git a/nageru/video_encoder.cpp b/nageru/video_encoder.cpp index 877cbff..655788b 100644 --- a/nageru/video_encoder.cpp +++ b/nageru/video_encoder.cpp @@ -81,14 +81,14 @@ VideoEncoder::VideoEncoder(ResourcePool *resource_pool, QSurface *surface, const quicksync_encoder.reset(new QuickSyncEncoder(filename, resource_pool, surface, va_display, width, height, oformat, http_encoder, disk_encoder, disk_space_estimator)); open_output_stream(); - stream_audio_encoder->add_mux(stream_mux.get()); - quicksync_encoder->set_stream_mux(stream_mux.get()); + stream_audio_encoder->add_mux(http_mux.get()); + quicksync_encoder->set_http_mux(http_mux.get()); if (global_flags.x264_video_to_http) { - x264_encoder->add_mux(stream_mux.get()); + x264_encoder->add_mux(http_mux.get()); } #ifdef HAVE_AV1 if (global_flags.av1_video_to_http) { - av1_encoder->add_mux(stream_mux.get()); + av1_encoder->add_mux(http_mux.get()); } #endif } @@ -116,7 +116,7 @@ void VideoEncoder::do_cut(int frame) // However, since this means both encoders could be sending packets at // the same time, it means pts could come out of order to the stream mux, // and we need to plug it until the shutdown is complete. - stream_mux->plug(); + http_mux->plug(); lock(qs_mu, qs_audio_mu); lock_guard lock1(qs_mu, adopt_lock), lock2(qs_audio_mu, adopt_lock); QuickSyncEncoder *old_encoder = quicksync_encoder.release(); // When we go C++14, we can use move capture instead. @@ -133,7 +133,7 @@ void VideoEncoder::do_cut(int frame) delete old_x264_encoder; delete old_x264_disk_encoder; old_encoder->close_file(); - stream_mux->unplug(); + http_mux->unplug(); // We cannot delete the encoder here, as this thread has no OpenGL context. // We'll deal with it in begin_frame(). @@ -145,7 +145,7 @@ void VideoEncoder::do_cut(int frame) x264_encoder.reset(new X264Encoder(oformat, /*use_separate_disk_params=*/false)); assert(global_flags.x264_video_to_http); if (global_flags.x264_video_to_http) { - x264_encoder->add_mux(stream_mux.get()); + x264_encoder->add_mux(http_mux.get()); } if (overriding_bitrate != 0) { x264_encoder->change_bitrate(overriding_bitrate); @@ -159,7 +159,7 @@ void VideoEncoder::do_cut(int frame) } quicksync_encoder.reset(new QuickSyncEncoder(filename, resource_pool, surface, va_display, width, height, oformat, http_encoder, disk_encoder, disk_space_estimator)); - quicksync_encoder->set_stream_mux(stream_mux.get()); + quicksync_encoder->set_http_mux(http_mux.get()); } void VideoEncoder::change_x264_bitrate(unsigned rate_kbit) @@ -230,10 +230,10 @@ void VideoEncoder::open_output_stream() #endif } - stream_mux.reset(new Mux(avctx, width, height, video_codec, video_extradata, stream_audio_encoder->get_codec_parameters().get(), + http_mux.reset(new Mux(avctx, width, height, video_codec, video_extradata, stream_audio_encoder->get_codec_parameters().get(), get_color_space(global_flags.ycbcr_rec709_coefficients), COARSE_TIMEBASE, - /*write_callback=*/nullptr, Mux::WRITE_FOREGROUND, { &stream_mux_metrics })); - stream_mux_metrics.init({{ "destination", "http" }}); + /*write_callback=*/nullptr, Mux::WRITE_FOREGROUND, { &http_mux_metrics })); + http_mux_metrics.init({{ "destination", "http" }}); } int VideoEncoder::write_packet2_thunk(void *opaque, uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time) @@ -253,8 +253,8 @@ int VideoEncoder::write_packet2(uint8_t *buf, int buf_size, AVIODataMarkerType t } if (type == AVIO_DATA_MARKER_HEADER) { - stream_mux_header.append((char *)buf, buf_size); - httpd->set_header(HTTPD::StreamID{ HTTPD::MAIN_STREAM, 0 }, stream_mux_header); + http_mux_header.append((char *)buf, buf_size); + httpd->set_header(HTTPD::StreamID{ HTTPD::MAIN_STREAM, 0 }, http_mux_header); } else { httpd->add_data(HTTPD::StreamID{ HTTPD::MAIN_STREAM, 0 }, (char *)buf, buf_size, type == AVIO_DATA_MARKER_SYNC_POINT, time, AVRational{ AV_TIME_BASE, 1 }); } diff --git a/nageru/video_encoder.h b/nageru/video_encoder.h index 7a5fef1..61b16f7 100644 --- a/nageru/video_encoder.h +++ b/nageru/video_encoder.h @@ -91,7 +91,7 @@ private: bool seen_sync_markers = false; - std::unique_ptr stream_mux; // To HTTP. + std::unique_ptr http_mux; // To the HTTP server. std::unique_ptr stream_audio_encoder; std::unique_ptr x264_encoder; // nullptr if not using x264. std::unique_ptr x264_disk_encoder; // nullptr if not using x264, or if not having separate disk encodes. @@ -99,8 +99,8 @@ private: std::unique_ptr av1_encoder; // nullptr if not using SVT-AV1. #endif - std::string stream_mux_header; - MuxMetrics stream_mux_metrics; + std::string http_mux_header; + MuxMetrics http_mux_metrics; std::atomic quicksync_encoders_in_shutdown{0}; std::atomic overriding_bitrate{0}; -- 2.39.2