Skip to content
This repository was archived by the owner on Oct 25, 2024. It is now read-only.

Commit 93779d8

Browse files
perkjCommit Bot
authored andcommitted
[Merge M88] Ensure EncoderSink::OnBitrateAllocationUpdated not called after Stop
(cherry picked from commit c4ad606) Bug: chromium:1143311, webrtc:12000 Change-Id: I149e960a4999442b289f4b3c576206cc6baf6f24 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/193063 Reviewed-by: Erik Språng <[email protected]> Reviewed-by: Per Kjellander <[email protected]> Commit-Queue: Per Kjellander <[email protected]> Cr-Original-Commit-Position: refs/heads/master@{#32605} Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/193865 Reviewed-by: Mirko Bonadei <[email protected]> Cr-Commit-Position: refs/branch-heads/4324@{#1} Cr-Branched-From: daab689-refs/heads/master@{#32599}
1 parent daab689 commit 93779d8

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

video/video_stream_encoder.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,7 @@ void VideoStreamEncoder::Stop() {
486486
}
487487
rate_allocator_ = nullptr;
488488
ReleaseEncoder();
489+
encoder_ = nullptr;
489490
shutdown_event.Set();
490491
});
491492
shutdown_event.Wait(rtc::Event::kForever);

0 commit comments

Comments
 (0)