diff options
| author | Oleh Prypin <oprypin@webrtc.org> | 2019-03-29 15:33:01 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-03-29 15:52:11 +0000 |
| commit | e8964903a948a3f67c29cb22ee4aaf9c931e4672 (patch) | |
| tree | 4d700c0437bb0ce8c9d132dacf4b1bc7c1bf87ad /call/rtp_video_sender_unittest.cc | |
| parent | e8bc3a0a5ab6d7d36efbe4bf0742adac3dc49345 (diff) | |
| download | webrtc-e8964903a948a3f67c29cb22ee4aaf9c931e4672.tar.gz | |
Revert "Fix target bitrate RTCP messages behavior for SVC streams"
This reverts commit ab65d8aab5fe63619033371fca1ce2711c2c2137.
Reason for revert: Fails video_engine_tests ExtendedReportsEndToEndTest.TestExtendedReportsCanSignalZeroTargetBitrate
https://ci.chromium.org/p/webrtc/builders/ci/Linux%20MSan/18366
Original change's description:
> Fix target bitrate RTCP messages behavior for SVC streams
>
> Before this CL for SVC streams (e.g VP9) still 3 separate RTP_RTCP senders
> were created. The RTCP target bitrate messages were treated as simulcast
> and were split and send for each separate spatial layer in a separate SSRC.
>
> To fix that an svc flag is now wired to VideoSendStream config
> and filled based on the encoder config in WebrtcVideoEngine. This flag is
> used to differentiate between simulcast and SVC mode in RtpVideoSender.
>
> Bug: webrtc:10485
> Change-Id: Ifa01d12a7d4f01fcbe448ad11e0cc39ab2d1df55
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/129929
> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
> Reviewed-by: Niels Moller <nisse@webrtc.org>
> Reviewed-by: Erik Språng <sprang@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#27345}
TBR=ilnik@webrtc.org,nisse@webrtc.org,sprang@webrtc.org
Change-Id: I184f87289d9dccc67de165038d76a5690158a3b5
No-Tree-Checks: True
No-Try: True
Bug: webrtc:10485
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/130467
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27355}
Diffstat (limited to 'call/rtp_video_sender_unittest.cc')
| -rw-r--r-- | call/rtp_video_sender_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/call/rtp_video_sender_unittest.cc b/call/rtp_video_sender_unittest.cc index e51e72af86..1a1dd9bdde 100644 --- a/call/rtp_video_sender_unittest.cc +++ b/call/rtp_video_sender_unittest.cc @@ -99,7 +99,7 @@ class RtpVideoSenderTestFixture { std::map<uint32_t, RtpState> suspended_ssrcs; router_ = absl::make_unique<RtpVideoSender>( &clock_, suspended_ssrcs, suspended_payload_states, config_.rtp, - config_.rtcp_report_interval_ms, &transport_, config_.is_svc, + config_.rtcp_report_interval_ms, &transport_, CreateObservers(&call_stats_, &encoder_feedback_, &stats_proxy_, &stats_proxy_, &stats_proxy_, frame_count_observer, &stats_proxy_, &stats_proxy_, &send_delay_stats_), |