Rebase to recent develop fixes

baranovmv · May 21, 2024 · 7c833fa · 7c833fa
1 parent c114203
commit 7c833fa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/internal_modules/roc_pipeline/receiver_source.cpp b/src/internal_modules/roc_pipeline/receiver_source.cpp
@@ -89,7 +89,7 @@ ReceiverSlot* ReceiverSource::create_slot(const ReceiverSlotConfig& slot_config)
     core::SharedPtr<ReceiverSlot> slot =
         new (arena_) ReceiverSlot(source_config_, slot_config, state_tracker_, *mixer_,
                                   encoding_map_, packet_factory_, frame_factory_,
-                                  dumper_.get(), NULL, arena_);
+                                  dumper_.get(), arena_);
 
     if (!slot || !slot->is_valid()) {
         roc_log(LogError, "receiver source: can't create slot");

diff --git a/src/tests/roc_fec/test_writer_reader.cpp b/src/tests/roc_fec/test_writer_reader.cpp
@@ -391,15 +391,16 @@ TEST(writer_reader, lost_first_packet_in_first_block) {
         UNSIGNED_LONGS_EQUAL(0, dispatcher.source_size());
     }
 }
+
 IGNORE_TEST(writer_reader, lost_first_packet_in_two_blocks) {
     for (size_t n_scheme = 0; n_scheme < CodecMap::instance().num_schemes(); n_scheme++) {
         codec_config.scheme = CodecMap::instance().nth_scheme(n_scheme);
 
         core::ScopedPtr<IBlockEncoder> encoder(
-            CodecMap::instance().new_encoder(codec_config, buffer_factory, arena), arena);
+            CodecMap::instance().new_encoder(codec_config, packet_factory, arena), arena);
 
         core::ScopedPtr<IBlockDecoder> decoder(
-            CodecMap::instance().new_decoder(codec_config, buffer_factory, arena), arena);
+            CodecMap::instance().new_decoder(codec_config, packet_factory, arena), arena);
 
         CHECK(encoder);
         CHECK(decoder);
@@ -410,7 +411,7 @@ IGNORE_TEST(writer_reader, lost_first_packet_in_two_blocks) {
 
         Writer writer(writer_config, codec_config.scheme, *encoder, dispatcher,
                       source_composer(), repair_composer(), packet_factory,
-                      buffer_factory, arena);
+                      arena);
 
         Reader reader(reader_config, codec_config.scheme, *decoder,
                       dispatcher.source_reader(), dispatcher.repair_reader(), rtp_parser,

diff --git a/src/tests/roc_rtp/test_link_meter.cpp b/src/tests/roc_rtp/test_link_meter.cpp
@@ -24,14 +24,13 @@ namespace rtp {
 
 namespace {
 
-enum { PacketSz = 100 };
+enum { ChMask = 3, PacketSz = 100, SampleRate = 10000, Duration = 100 };
 
 core::HeapArena arena;
 packet::PacketFactory packet_factory(arena, PacketSz);
 
 EncodingMap encoding_map(arena);
 
-enum { ChMask = 3, PacketSz = 128, SampleRate = 10000, Duration = 100 };
 audio::SampleSpec sample_spec(SampleRate,
                               audio::Sample_RawFormat,
                               audio::ChanLayout_Surround,