Merge remote-tracking branch 'origin/master'

src/audio.cpp

@@ -2,16 +2,18 @@
  * @file src/audio.cpp
  * @brief Definitions for audio capture and encoding.
  */
+// standard includes
 #include <thread>
 
+// lib includes
 #include <opus/opus_multistream.h>
 
-#include "platform/common.h"
-
+// local includes
 #include "audio.h"
 #include "config.h"
 #include "globals.h"
 #include "logging.h"
+#include "platform/common.h"
 #include "thread_safe.h"
 #include "utility.h"
 
@@ -20,15 +22,11 @@ namespace audio {
   using opus_t = util::safe_ptr<OpusMSEncoder, opus_multistream_encoder_destroy>;
   using sample_queue_t = std::shared_ptr<safe::queue_t<std::vector<float>>>;
 
-  static int
-  start_audio_control(audio_ctx_t &ctx);
-  static void
-  stop_audio_control(audio_ctx_t &);
-  static void
-  apply_surround_params(opus_stream_config_t &stream, const stream_params_t &params);
+  static int start_audio_control(audio_ctx_t &ctx);
+  static void stop_audio_control(audio_ctx_t &);
+  static void apply_surround_params(opus_stream_config_t &stream, const stream_params_t &params);
 
-  int
-  map_stream(int channels, bool quality);
+  int map_stream(int channels, bool quality);
 
   constexpr auto SAMPLE_RATE = 48000;
 
@@ -85,8 +83,7 @@ namespace audio {
     },
   };
 
-  void
-  encodeThread(sample_queue_t samples, config_t config, void *channel_data) {
+  void encodeThread(sample_queue_t samples, config_t config, void *channel_data) {
     auto packets = mail::man->queue<packet_t>(mail::audio_packets);
     auto stream = stream_configs[map_stream(config.channels, config.flags[config_t::HIGH_QUALITY])];
     if (config.flags[config_t::CUSTOM_SURROUND_PARAMS]) {
@@ -96,14 +93,15 @@ namespace audio {
     // Encoding takes place on this thread
     platf::adjust_thread_priority(platf::thread_priority_e::high);
 
-    opus_t opus { opus_multistream_encoder_create(
+    opus_t opus {opus_multistream_encoder_create(
       stream.sampleRate,
       stream.channelCount,
       stream.streams,
       stream.coupledStreams,
       stream.mapping,
       OPUS_APPLICATION_RESTRICTED_LOWDELAY,
-      nullptr) };
+      nullptr
+    )};
 
     opus_multistream_encoder_ctl(opus.get(), OPUS_SET_BITRATE(stream.bitrate));
     opus_multistream_encoder_ctl(opus.get(), OPUS_SET_VBR(0));
@@ -114,7 +112,7 @@ namespace audio {
 
     auto frame_size = config.packetDuration * stream.sampleRate / 1000;
     while (auto sample = samples->pop()) {
-      buffer_t packet { 1400 };
+      buffer_t packet {1400};
 
       int bytes = opus_multistream_encode_float(opus.get(), sample->data(), frame_size, std::begin(packet), packet.size());
       if (bytes < 0) {
@@ -129,8 +127,7 @@ namespace audio {
     }
   }
 
-  void
-  capture(safe::mail_t mail, config_t config, void *channel_data) {
+  void capture(safe::mail_t mail, config_t config, void *channel_data) {
     auto shutdown_event = mail->event<bool>(mail::shutdown);
 
     if (config.input_only) {
@@ -214,7 +211,7 @@ namespace audio {
     platf::adjust_thread_priority(platf::thread_priority_e::critical);
 
     auto samples = std::make_shared<sample_queue_t::element_type>(30);
-    std::thread thread { encodeThread, samples, config, channel_data };
+    std::thread thread {encodeThread, samples, config, channel_data};
 
     auto fg = util::fail_guard([&]() {
       samples->stop();
@@ -256,14 +253,12 @@ namespace audio {
     }
   }
 
-  audio_ctx_ref_t
-  get_audio_ctx_ref() {
-    static auto control_shared { safe::make_shared<audio_ctx_t>(start_audio_control, stop_audio_control) };
+  audio_ctx_ref_t get_audio_ctx_ref() {
+    static auto control_shared {safe::make_shared<audio_ctx_t>(start_audio_control, stop_audio_control)};
     return control_shared.ref();
   }
 
-  bool
-  is_audio_ctx_sink_available(const audio_ctx_t &ctx) {
+  bool is_audio_ctx_sink_available(const audio_ctx_t &ctx) {
     if (!ctx.control) {
       return false;
     }
@@ -276,8 +271,7 @@ namespace audio {
     return ctx.control->is_sink_available(sink);
   }
 
-  int
-  map_stream(int channels, bool quality) {
+  int map_stream(int channels, bool quality) {
     int shift = quality ? 1 : 0;
     switch (channels) {
       case 2:
@@ -290,8 +284,7 @@ namespace audio {
     return STEREO;
   }
 
-  int
-  start_audio_control(audio_ctx_t &ctx) {
+  int start_audio_control(audio_ctx_t &ctx) {
     auto fg = util::fail_guard([]() {
       BOOST_LOG(warning) << "There will be no audio"sv;
     });
@@ -318,8 +311,7 @@ namespace audio {
     return 0;
   }
 
-  void
-  stop_audio_control(audio_ctx_t &ctx) {
+  void stop_audio_control(audio_ctx_t &ctx) {
     // restore audio-sink if applicable
     if (!ctx.restore_sink) {
       return;
@@ -333,8 +325,7 @@ namespace audio {
     }
   }
 
-  void
-  apply_surround_params(opus_stream_config_t &stream, const stream_params_t &params) {
+  void apply_surround_params(opus_stream_config_t &stream, const stream_params_t &params) {
     stream.channelCount = params.channelCount;
     stream.streams = params.streams;
     stream.coupledStreams = params.coupledStreams;