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

Update video/ to not use implicit T* --> scoped_refptr<T> conversion

Browse Source 
Bug: webrtc:13464
Change-Id: I4da4c1a6519d305dcf68ab784e167943b44af152
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/246201
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35686}
This commit is contained in:
Niels Möller
2022-01-13 13:58:46 +01:00
committed by WebRTC LUCI CQ
parent 93b208992b
commit 806083bf06
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
video/adaptation/pixel_limit_resource.cc
View File

@ -84,11 +84,11 @@ void PixelLimitResource::SetResourceListener(ResourceListener* listener) {
int target_pixels_lower_bounds = int target_pixels_lower_bounds =
GetLowerResolutionThan(target_pixel_upper_bounds); GetLowerResolutionThan(target_pixel_upper_bounds);
if (current_pixels > target_pixel_upper_bounds) { if (current_pixels > target_pixel_upper_bounds) {
listener_->OnResourceUsageStateMeasured(this, listener_->OnResourceUsageStateMeasured(
ResourceUsageState::kOveruse); rtc::scoped_refptr<Resource>(this), ResourceUsageState::kOveruse);
} else if (current_pixels < target_pixels_lower_bounds) { } else if (current_pixels < target_pixels_lower_bounds) {
listener_->OnResourceUsageStateMeasured(this, listener_->OnResourceUsageStateMeasured(
ResourceUsageState::kUnderuse); rtc::scoped_refptr<Resource>(this), ResourceUsageState::kUnderuse);
} }
return kResourceUsageCheckIntervalMs; return kResourceUsageCheckIntervalMs;
}); });

3
video/adaptation/video_stream_encoder_resource.cc
View File

@ -51,7 +51,8 @@ void VideoStreamEncoderResource::OnResourceUsageStateMeasured(
ResourceUsageState usage_state) { ResourceUsageState usage_state) {
MutexLock crit(&lock_); MutexLock crit(&lock_);
if (listener_) { if (listener_) {
listener_->OnResourceUsageStateMeasured(this, usage_state); listener_->OnResourceUsageStateMeasured(rtc::scoped_refptr<Resource>(this),
usage_state);
} }
} }

4
video/buffered_frame_decryptor_unittest.cc
View File

@ -89,7 +89,7 @@ class BufferedFrameDecryptorTest : public ::testing::Test,
mock_frame_decryptor_ = rtc::make_ref_counted<MockFrameDecryptor>(); mock_frame_decryptor_ = rtc::make_ref_counted<MockFrameDecryptor>();
buffered_frame_decryptor_ = buffered_frame_decryptor_ =
std::make_unique<BufferedFrameDecryptor>(this, this); std::make_unique<BufferedFrameDecryptor>(this, this);
buffered_frame_decryptor_->SetFrameDecryptor(mock_frame_decryptor_.get()); buffered_frame_decryptor_->SetFrameDecryptor(mock_frame_decryptor_);
} }
static const size_t kMaxStashedFrames; static const size_t kMaxStashedFrames;
@ -219,7 +219,7 @@ TEST_F(BufferedFrameDecryptorTest, FramesStoredIfDecryptorNull) {
.WillRepeatedly(Return(0)); .WillRepeatedly(Return(0));
// Attach the frame decryptor at a later point after frames have arrived. // Attach the frame decryptor at a later point after frames have arrived.
buffered_frame_decryptor_->SetFrameDecryptor(mock_frame_decryptor_.get()); buffered_frame_decryptor_->SetFrameDecryptor(mock_frame_decryptor_);
// Next frame should trigger kMaxStashedFrame decryptions. // Next frame should trigger kMaxStashedFrame decryptions.
buffered_frame_decryptor_->ManageEncryptedFrame(CreateRtpFrameObject(true)); buffered_frame_decryptor_->ManageEncryptedFrame(CreateRtpFrameObject(true));

4
video/rtp_video_stream_receiver_frame_transformer_delegate.cc
View File

@ -102,8 +102,8 @@ void RtpVideoStreamReceiverFrameTransformerDelegate::TransformFrame(
void RtpVideoStreamReceiverFrameTransformerDelegate::OnTransformedFrame( void RtpVideoStreamReceiverFrameTransformerDelegate::OnTransformedFrame(
std::unique_ptr<TransformableFrameInterface> frame) { std::unique_ptr<TransformableFrameInterface> frame) {
rtc::scoped_refptr<RtpVideoStreamReceiverFrameTransformerDelegate> delegate = rtc::scoped_refptr<RtpVideoStreamReceiverFrameTransformerDelegate> delegate(
this; this);
network_thread_->PostTask(ToQueuedTask( network_thread_->PostTask(ToQueuedTask(
[delegate = std::move(delegate), frame = std::move(frame)]() mutable { [delegate = std::move(delegate), frame = std::move(frame)]() mutable {
delegate->ManageFrame(std::move(frame)); delegate->ManageFrame(std::move(frame));