Index: webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc |
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc |
index 916561ea876bbc40af46433dca401e7a5519f6b7..fb9bf4a5285b1b5c830bb7da7e29f3e1634a6640 100644 |
--- a/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc |
+++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc |
@@ -55,9 +55,7 @@ RTPSenderVideo::RTPSenderVideo(Clock* clock, RTPSender* rtp_sender) |
delta_fec_params_{0, 1, kFecMaskRandom}, |
key_fec_params_{0, 1, kFecMaskRandom}, |
fec_bitrate_(1000, RateStatistics::kBpsScale), |
- video_bitrate_(1000, RateStatistics::kBpsScale) { |
- encoder_checker_.Detach(); |
-} |
+ video_bitrate_(1000, RateStatistics::kBpsScale) { } |
RTPSenderVideo::~RTPSenderVideo() {} |
@@ -245,7 +243,6 @@ bool RTPSenderVideo::SendVideo(RtpVideoCodecTypes video_type, |
size_t payload_size, |
const RTPFragmentationHeader* fragmentation, |
const RTPVideoHeader* video_header) { |
- RTC_DCHECK_CALLED_SEQUENTIALLY(&encoder_checker_); |
if (payload_size == 0) |
return false; |
@@ -267,6 +264,8 @@ bool RTPSenderVideo::SendVideo(RtpVideoCodecTypes video_type, |
if (video_header) { |
// Set rotation when key frame or when changed (to follow standard). |
// Or when different from 0 (to follow current receiver implementation). |
+ // TODO(kthelgason): Merge this crit scope with the one below. |
+ rtc::CritScope cs(&crit_); |
VideoRotation current_rotation = video_header->rotation; |
if (frame_type == kVideoFrameKey || current_rotation != last_rotation_ || |
current_rotation != kVideoRotation_0) |