diff options
| author | Per Kjellander <perkj@webrtc.org> | 2022-12-02 08:09:37 +0000 |
|---|---|---|
| committer | WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-12-02 12:03:25 +0000 |
| commit | 59ade0172fdb7d521bca8ca4e837abf7e90bc604 (patch) | |
| tree | cf797638238868ba87195dfbc2784d5466d5cfb7 /media | |
| parent | 3fcd49e97237db3668f03991129126b6781b936d (diff) | |
| download | webrtc-59ade0172fdb7d521bca8ca4e837abf7e90bc604.tar.gz | |
Reland "Remame VideoSendStream::UpdateActiveSimulcastLayers to StartPerRtpStream"
This reverts commit 75170be4acc90fece7c65f1a5b9bef03a5cc3880.
Reason for revert: Perf regression not affecting open source.
Original change's description:
> Revert "Remame VideoSendStream::UpdateActiveSimulcastLayers to StartPerRtpStream"
>
> This reverts commit d8c4de71722c9de38f942932be21d4015f32a3bc.
>
> Reason for revert: Tentative revert due to possible perf regression. b/260123362
>
> Original change's description:
> > Remame VideoSendStream::UpdateActiveSimulcastLayers to StartPerRtpStream
> >
> > VideoSendStreamImpl::Start and VideoSendStream::Start are not used by PeerConnections, only StartPerRtpStream.
> > Therefore this cl:
> > - Change implementation of VideoSendStream::Start to use VideoSendStream::StartPerRtpStream. VideoSendstream::Start is kept for convenience.
> > - Remove VideoSendStreamImpl::Start() since it was only used by tests that use call and is confusing.
> > - RtpVideoSender::SetActive is removed/changed to RtpVideoSender::Stop(). For normal operations RtpVideoSender::SetActiveModules is used.
> >
> > Bug: none
> > Change-Id: I43b153250b07c02fe63c84e3c4cec18d4ec0d47a
> > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/283660
> > Reviewed-by: Erik Språng <sprang@webrtc.org>
> > Commit-Queue: Per Kjellander <perkj@webrtc.org>
> > Cr-Commit-Position: refs/heads/main@{#38698}
>
> Bug: none
> Change-Id: I4f0d27679e51361b9ec54d2ae8e4d972527875d1
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/284940
> Reviewed-by: Per Kjellander <perkj@webrtc.org>
> Commit-Queue: Erik Språng <sprang@webrtc.org>
> Auto-Submit: Per Kjellander <perkj@webrtc.org>
> Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
> Reviewed-by: Erik Språng <sprang@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#38725}
Bug: b/260400659
Change-Id: Ie8e545edcad85284a7d612183a8e4201672d0b5e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/285900
Auto-Submit: Per Kjellander <perkj@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Erik Språng <sprang@webrtc.org>
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#38794}
Diffstat (limited to 'media')
| -rw-r--r-- | media/engine/fake_webrtc_call.cc | 2 | ||||
| -rw-r--r-- | media/engine/fake_webrtc_call.h | 2 | ||||
| -rw-r--r-- | media/engine/webrtc_video_engine.cc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/media/engine/fake_webrtc_call.cc b/media/engine/fake_webrtc_call.cc index 063be93269..8046c3ad3a 100644 --- a/media/engine/fake_webrtc_call.cc +++ b/media/engine/fake_webrtc_call.cc @@ -338,7 +338,7 @@ void FakeVideoSendStream::ReconfigureVideoEncoder( webrtc::InvokeSetParametersCallback(callback, webrtc::RTCError::OK()); } -void FakeVideoSendStream::UpdateActiveSimulcastLayers( +void FakeVideoSendStream::StartPerRtpStream( const std::vector<bool> active_layers) { sending_ = false; for (const bool active_layer : active_layers) { diff --git a/media/engine/fake_webrtc_call.h b/media/engine/fake_webrtc_call.h index a3876b3ca8..370b70700f 100644 --- a/media/engine/fake_webrtc_call.h +++ b/media/engine/fake_webrtc_call.h @@ -202,7 +202,7 @@ class FakeVideoSendStream final void OnFrame(const webrtc::VideoFrame& frame) override; // webrtc::VideoSendStream implementation. - void UpdateActiveSimulcastLayers(std::vector<bool> active_layers) override; + void StartPerRtpStream(std::vector<bool> active_layers) override; void Start() override; void Stop() override; bool started() override { return IsSending(); } diff --git a/media/engine/webrtc_video_engine.cc b/media/engine/webrtc_video_engine.cc index 8dfc46c641..d4bdeff992 100644 --- a/media/engine/webrtc_video_engine.cc +++ b/media/engine/webrtc_video_engine.cc @@ -2439,7 +2439,7 @@ void WebRtcVideoChannel::WebRtcVideoSendStream::UpdateSendState() { } // This updates what simulcast layers are sending, and possibly starts // or stops the VideoSendStream. - stream_->UpdateActiveSimulcastLayers(active_layers); + stream_->StartPerRtpStream(active_layers); } else { if (stream_ != nullptr) { stream_->Stop(); @@ -2846,7 +2846,7 @@ void WebRtcVideoChannel::WebRtcVideoSendStream::RecreateWebRtcStream() { parameters_.encoder_config.encoder_specific_settings = NULL; - // Calls stream_->UpdateActiveSimulcastLayers() to start the VideoSendStream + // Calls stream_->StartPerRtpStream() to start the VideoSendStream // if necessary conditions are met. UpdateSendState(); |