Skip to content

Commit 0086b99

Browse files
jmillanjmillan
committed
Do not make listener const
We should make this decision broadly
1 parent 2785458 commit 0086b99

File tree

1 file changed

+38
-38
lines changed

1 file changed

+38
-38
lines changed

‎worker/test/src/RTC/TestSvcProducerStreamManager.cpp‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
222222

223223
SECTION("ProcessRtpPacket() returns DROP when target spatial layer is -1")
224224
{
225-
const MockListener listener;
225+
MockListener listener;
226226
auto manager = createManager(&listener);
227227
auto rtpStream = createRtpStreamRecv();
228228

@@ -238,7 +238,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
238238

239239
SECTION("ProcessRtpPacket() returns DROP when target temporal layer is -1")
240240
{
241-
const MockListener listener;
241+
MockListener listener;
242242
auto manager = createManager(&listener);
243243
auto rtpStream = createRtpStreamRecv();
244244

@@ -256,7 +256,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
256256

257257
SECTION("ProcessRtpPacket() returns BUFFER when sync required and packet is not a keyframe")
258258
{
259-
const MockListener listener;
259+
MockListener listener;
260260
auto manager = createManager(&listener);
261261
auto rtpStream = createRtpStreamRecv();
262262

@@ -280,7 +280,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
280280
SECTION(
281281
"ProcessRtpPacket() returns FORWARD with isSyncPacket and sendBufferedPackets on keyframe sync")
282282
{
283-
const MockListener listener;
283+
MockListener listener;
284284
auto manager = createManager(&listener);
285285
auto rtpStream = createRtpStreamRecv();
286286

@@ -314,7 +314,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
314314

315315
SECTION("ProcessRtpPacket() always requires a keyframe for sync regardless of keyFrameSupported flag")
316316
{
317-
const MockListener listener;
317+
MockListener listener;
318318
// keyFrameSupported=false has no effect in SVC: sync always needs a keyframe.
319319
auto manager = createManager(
320320
&listener,
@@ -358,7 +358,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
358358

359359
SECTION("ProcessRtpPacket() returns DROP for empty payload packets")
360360
{
361-
const MockListener listener;
361+
MockListener listener;
362362
auto manager = createManager(
363363
&listener,
364364
/*preferredLayers*/ { 2, 2 },
@@ -391,7 +391,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
391391

392392
SECTION("ProcessRtpPacket() returns DROP when ProcessPayload fails")
393393
{
394-
const MockListener listener;
394+
MockListener listener;
395395
auto encodingContext = std::make_unique<MockEncodingContext>();
396396
auto manager = createManager(
397397
&listener,
@@ -430,7 +430,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
430430

431431
SECTION("ProcessRtpPacket() returns FORWARD for normal packets after sync")
432432
{
433-
const MockListener listener;
433+
MockListener listener;
434434
auto manager = createManager(
435435
&listener,
436436
/*preferredLayers*/ { 2, 2 },
@@ -465,7 +465,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
465465

466466
SECTION("ProcessRtpPacket() always sets tsOffset to 0 (SVC uses single stream)")
467467
{
468-
const MockListener listener;
468+
MockListener listener;
469469
auto manager = createManager(
470470
&listener,
471471
/*preferredLayers*/ { 2, 2 },
@@ -501,7 +501,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
501501

502502
SECTION("UpdateTargetLayers() to -1 resets current and target layers")
503503
{
504-
const MockListener listener;
504+
MockListener listener;
505505
auto manager = createManager(&listener);
506506
auto rtpStream = createRtpStreamRecv();
507507

@@ -520,7 +520,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
520520

521521
SECTION("UpdateTargetLayers() fires OnProducerStreamManagerLayersChanged() when setting -1")
522522
{
523-
const MockListener listener;
523+
MockListener listener;
524524
auto manager = createManager(&listener);
525525
auto rtpStream = createRtpStreamRecv();
526526

@@ -535,7 +535,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
535535

536536
SECTION("UpdateTargetLayers() requests keyframe for full-SVC spatial upgrade")
537537
{
538-
const MockListener listener;
538+
MockListener listener;
539539
auto manager = createManager(&listener);
540540
auto rtpStream = createRtpStreamRecv();
541541

@@ -555,7 +555,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
555555

556556
SECTION("GetProducerCurrentRtpStream() returns nullptr when current spatial layer is -1")
557557
{
558-
const MockListener listener;
558+
MockListener listener;
559559
auto manager = createManager(&listener);
560560
auto rtpStream = createRtpStreamRecv();
561561

@@ -568,7 +568,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
568568

569569
SECTION("GetProducerTargetRtpStream() returns nullptr when target spatial layer is -1")
570570
{
571-
const MockListener listener;
571+
MockListener listener;
572572
auto manager = createManager(&listener);
573573
auto rtpStream = createRtpStreamRecv();
574574

@@ -579,7 +579,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
579579

580580
SECTION("GetProducerTargetRtpStream() returns the producer stream after UpdateTargetLayers()")
581581
{
582-
const MockListener listener;
582+
MockListener listener;
583583
auto manager = createManager(&listener);
584584
auto rtpStream = createRtpStreamRecv();
585585

@@ -606,7 +606,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
606606

607607
SECTION("IsActive() returns false when no producer stream is set")
608608
{
609-
const MockListener listener;
609+
MockListener listener;
610610
auto manager = createManager(&listener);
611611

612612
// No ProducerRtpStream call.
@@ -671,7 +671,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
671671

672672
SECTION("OnTransportConnected() sets syncRequired")
673673
{
674-
const MockListener listener;
674+
MockListener listener;
675675
auto manager = createManager(
676676
&listener,
677677
/*preferredLayers*/ { 2, 2 },
@@ -715,7 +715,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
715715

716716
SECTION("OnTransportConnected() requests keyframe when active and target changes")
717717
{
718-
const MockListener listener;
718+
MockListener listener;
719719
// Use preferred layer 0 so RecalculateTargetLayers can find it with spatial-layer-0 bitrate.
720720
auto manager = createManager(&listener, /*preferredLayers*/ { 0, 0 });
721721
auto rtpStream = createRtpStreamRecv(mappedSsrc, /*spatialLayers*/ 1u, /*temporalLayers*/ 1u);
@@ -752,7 +752,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
752752

753753
SECTION("OnTransportDisconnected() resets target and current layers to -1")
754754
{
755-
const MockListener listener;
755+
MockListener listener;
756756
auto manager = createManager(&listener);
757757
auto rtpStream = createRtpStreamRecv();
758758

@@ -770,7 +770,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
770770

771771
SECTION("OnPaused() resets target and current layers to -1")
772772
{
773-
const MockListener listener;
773+
MockListener listener;
774774
auto manager = createManager(&listener);
775775
auto rtpStream = createRtpStreamRecv();
776776

@@ -788,7 +788,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
788788

789789
SECTION("OnResumed() sets syncRequired and requests keyframe when active")
790790
{
791-
const MockListener listener;
791+
MockListener listener;
792792
// Use preferred layer 0 so RecalculateTargetLayers can find it with spatial-layer-0 bitrate.
793793
auto manager = createManager(&listener, /*preferredLayers*/ { 0, 0 });
794794
auto rtpStream = createRtpStreamRecv(mappedSsrc, /*spatialLayers*/ 1u, /*temporalLayers*/ 1u);
@@ -817,7 +817,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
817817

818818
SECTION("OnResumed() sets syncRequired: next packet is a sync packet")
819819
{
820-
const MockListener listener;
820+
MockListener listener;
821821
auto manager = createManager(
822822
&listener,
823823
/*preferredLayers*/ { 2, 2 },
@@ -864,7 +864,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
864864

865865
SECTION("ProducerNewRtpStream() updates the producer stream and fires score event")
866866
{
867-
const MockListener listener;
867+
MockListener listener;
868868
auto manager = createManager(&listener);
869869
auto rtpStream0 = createRtpStreamRecv();
870870
auto rtpStream1 = createRtpStreamRecv();
@@ -882,7 +882,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
882882

883883
SECTION("ProducerRtpStreamScore() triggers MayChangeLayers() when stream dies (score==0)")
884884
{
885-
const MockListener listener;
885+
MockListener listener;
886886
auto manager = createManager(&listener);
887887
auto rtpStream = createRtpStreamRecv();
888888

@@ -901,7 +901,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
901901

902902
SECTION("ProducerRtpStreamScore() triggers MayChangeLayers() when stream revives (previousScore==0)")
903903
{
904-
const MockListener listener;
904+
MockListener listener;
905905
auto manager = createManager(&listener);
906906
auto rtpStream = createRtpStreamRecv();
907907

@@ -919,7 +919,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
919919

920920
SECTION("IncreaseLayer() returns 0 when no producer stream is set")
921921
{
922-
const MockListener listener;
922+
MockListener listener;
923923
auto manager = createManager(&listener);
924924

925925
manager->SetExternallyManagedBitrate();
@@ -933,7 +933,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
933933

934934
SECTION("IncreaseLayer() returns 0 when producer stream has score 0")
935935
{
936-
const MockListener listener;
936+
MockListener listener;
937937
auto manager = createManager(&listener);
938938
auto rtpStream = createRtpStreamRecv();
939939

@@ -950,7 +950,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
950950

951951
SECTION("IncreaseLayer() returns 0 on second call in same iteration (already at preferred layers)")
952952
{
953-
const MockListener listener;
953+
MockListener listener;
954954
// Single spatial/temporal layer so preferred == available immediately.
955955
auto encodingContext =
956956
std::make_unique<MockEncodingContext>(/*spatialLayers*/ 1u, /*temporalLayers*/ 1u);
@@ -985,7 +985,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
985985

986986
SECTION("IncreaseLayer() works again after ApplyLayers()")
987987
{
988-
const MockListener listener;
988+
MockListener listener;
989989
auto encodingContext =
990990
std::make_unique<MockEncodingContext>(/*spatialLayers*/ 1u, /*temporalLayers*/ 1u);
991991
auto manager = createManager(
@@ -1018,7 +1018,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
10181018

10191019
SECTION("ApplyLayers() records BWE downgrade when spatial layer drops below current")
10201020
{
1021-
const MockListener listener;
1021+
MockListener listener;
10221022
auto encodingContext =
10231023
std::make_unique<MockEncodingContext>(/*spatialLayers*/ 3u, /*temporalLayers*/ 3u);
10241024
auto manager = createManager(
@@ -1060,7 +1060,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
10601060

10611061
SECTION("GetDesiredBitrate() returns 0 when no producer stream is set")
10621062
{
1063-
const MockListener listener;
1063+
MockListener listener;
10641064
auto manager = createManager(&listener);
10651065

10661066
auto nowMs = DepLibUV::GetTimeMs();
@@ -1071,7 +1071,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
10711071

10721072
SECTION("GetDesiredBitrate() (full SVC) returns total stream bitrate")
10731073
{
1074-
const MockListener listener;
1074+
MockListener listener;
10751075
// Full SVC (ksvc=false).
10761076
auto encodingContext = std::make_unique<MockEncodingContext>(3u, 3u, /*ksvc*/ false);
10771077
auto manager = createManager(
@@ -1096,7 +1096,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
10961096

10971097
SECTION("GetDesiredBitrate() (K-SVC) returns the maximum spatial-layer bitrate")
10981098
{
1099-
const MockListener listener;
1099+
MockListener listener;
11001100
// K-SVC (ksvc=true): GetDesiredBitrate iterates per-layer bitrates.
11011101
auto encodingContext = std::make_unique<MockEncodingContext>(3u, 3u, /*ksvc*/ true);
11021102
auto manager = createManager(
@@ -1124,7 +1124,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
11241124

11251125
SECTION("RecalculateTargetLayers() returns false when no producer stream is set")
11261126
{
1127-
const MockListener listener;
1127+
MockListener listener;
11281128
auto manager = createManager(&listener);
11291129

11301130
RTC::ConsumerTypes::VideoLayers newTargetLayers;
@@ -1137,7 +1137,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
11371137

11381138
SECTION("RecalculateTargetLayers() resets layers when stream score is 0")
11391139
{
1140-
const MockListener listener;
1140+
MockListener listener;
11411141
auto manager = createManager(&listener);
11421142
auto rtpStream = createRtpStreamRecv();
11431143

@@ -1154,7 +1154,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
11541154

11551155
SECTION("K-SVC: UpdateTargetLayers() requests keyframe on any spatial layer change")
11561156
{
1157-
const MockListener listener;
1157+
MockListener listener;
11581158
auto encodingContext = std::make_unique<MockEncodingContext>(3u, 3u, /*ksvc*/ true);
11591159
auto manager = createManager(
11601160
&listener,
@@ -1209,7 +1209,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
12091209

12101210
SECTION("IncreaseLayer() uses virtual bitrate when considerLoss is true and loss < 2%")
12111211
{
1212-
const MockListener listener;
1212+
MockListener listener;
12131213
auto encodingContext = std::make_unique<MockEncodingContext>(1u, 1u, /*ksvc*/ false);
12141214
auto manager = createManager(
12151215
&listener,
@@ -1240,7 +1240,7 @@ SCENARIO("SvcProducerStreamManager", "[rtp][producer-stream-manager][svc]")
12401240

12411241
SECTION("IncreaseLayer() uses reduced virtual bitrate when considerLoss is true and loss > 10%")
12421242
{
1243-
const MockListener listener;
1243+
MockListener listener;
12441244
auto encodingContext = std::make_unique<MockEncodingContext>(1u, 1u, /*ksvc*/ false);
12451245
auto manager = createManager(
12461246
&listener,

0 commit comments

Comments
 (0)