zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced EncoderReconfiguredTask with lambda.

Browse Source 
Bug: None
Change-Id: If5f72592926d60235c1306a34b9126e0074cb92b
Reviewed-on: https://webrtc-review.googlesource.com/59200
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22326}
This commit is contained in:
Sebastian Jansson
2018-03-01 17:03:21 +01:00
committed by Commit Bot
parent 0f03973365
commit e4d79c73cc
1 changed files with 6 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
video/video_send_stream.cc
View File

@ -322,7 +322,6 @@ class VideoSendStreamImpl : public webrtc::BitrateAllocatorObserver,
private: private:
class CheckEncoderActivityTask; class CheckEncoderActivityTask;
class EncoderReconfiguredTask;
// Implements BitrateAllocatorObserver. // Implements BitrateAllocatorObserver.
uint32_t OnBitrateUpdated(uint32_t bitrate_bps, uint32_t OnBitrateUpdated(uint32_t bitrate_bps,
@ -504,28 +503,6 @@ class VideoSendStreamImpl::CheckEncoderActivityTask : public rtc::QueuedTask {
bool timed_out_; bool timed_out_;
}; };
class VideoSendStreamImpl::EncoderReconfiguredTask : public rtc::QueuedTask {
public:
EncoderReconfiguredTask(const rtc::WeakPtr<VideoSendStreamImpl>& send_stream,
std::vector<VideoStream> streams,
int min_transmit_bitrate_bps)
: send_stream_(std::move(send_stream)),
streams_(std::move(streams)),
min_transmit_bitrate_bps_(min_transmit_bitrate_bps) {}
private:
bool Run() override {
if (send_stream_)
send_stream_->OnEncoderConfigurationChanged(std::move(streams_),
min_transmit_bitrate_bps_);
return true;
}
rtc::WeakPtr<VideoSendStreamImpl> send_stream_;
std::vector<VideoStream> streams_;
int min_transmit_bitrate_bps_;
};
VideoSendStream::VideoSendStream( VideoSendStream::VideoSendStream(
int num_cpu_cores, int num_cpu_cores,
ProcessThread* module_process_thread, ProcessThread* module_process_thread,
@ -990,9 +967,12 @@ void VideoSendStreamImpl::OnEncoderConfigurationChanged(
std::vector<VideoStream> streams, std::vector<VideoStream> streams,
int min_transmit_bitrate_bps) { int min_transmit_bitrate_bps) {
if (!worker_queue_->IsCurrent()) { if (!worker_queue_->IsCurrent()) {
worker_queue_->PostTask( rtc::WeakPtr<VideoSendStreamImpl> send_stream = weak_ptr_;
std::unique_ptr<rtc::QueuedTask>(new EncoderReconfiguredTask( worker_queue_->PostTask([send_stream, streams, min_transmit_bitrate_bps]() {
weak_ptr_, std::move(streams), min_transmit_bitrate_bps))); if (send_stream)
send_stream->OnEncoderConfigurationChanged(std::move(streams),
min_transmit_bitrate_bps);
});
return; return;
} }
RTC_DCHECK_GE(config_->rtp.ssrcs.size(), streams.size()); RTC_DCHECK_GE(config_->rtp.ssrcs.size(), streams.size());