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

Commit

Permalink
[Merge M88] Ensure EncoderSink::OnBitrateAllocationUpdated not called…
Browse files Browse the repository at this point in the history
… 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 <sprang@webrtc.org>
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Commit-Queue: Per Kjellander <perkj@webrtc.org>
Cr-Original-Commit-Position: refs/heads/master@{#32605}
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/193865
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/branch-heads/4324@{#1}
Cr-Branched-From: daab689-refs/heads/master@{#32599}
  • Loading branch information
perkj authored and Commit Bot committed Nov 18, 2020
1 parent daab689 commit 93779d8
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions video/video_stream_encoder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,7 @@ void VideoStreamEncoder::Stop() {
}
rate_allocator_ = nullptr;
ReleaseEncoder();
encoder_ = nullptr;
shutdown_event.Set();
});
shutdown_event.Wait(rtc::Event::kForever);
Expand Down

0 comments on commit 93779d8

Please sign in to comment.