Replace more instances of rtc::RefCountedObject with make_ref_counted.
This is essentially replacing `new rtc::RefCountedObject` with `rtc::make_ref_counted` in many files. In a couple of places I made minor tweaks to make things compile such as adding parenthesis when they were missing. Bug: webrtc:12701 Change-Id: I3828dbf3ee0eb0232f3a47067474484ac2f4aed2 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/215973 Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Commit-Queue: Tommi <tommi@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33852}
This commit is contained in:
@ -248,9 +248,8 @@ void MultiplexDecoderAdapter::MergeAlphaImages(
|
||||
[yuv_buffer, alpha_buffer] {});
|
||||
}
|
||||
if (supports_augmenting_data_) {
|
||||
merged_buffer = rtc::scoped_refptr<webrtc::AugmentedVideoFrameBuffer>(
|
||||
new rtc::RefCountedObject<AugmentedVideoFrameBuffer>(
|
||||
merged_buffer, std::move(augmenting_data), augmenting_data_length));
|
||||
merged_buffer = rtc::make_ref_counted<AugmentedVideoFrameBuffer>(
|
||||
merged_buffer, std::move(augmenting_data), augmenting_data_length);
|
||||
}
|
||||
|
||||
VideoFrame merged_image = VideoFrame::Builder()
|
||||
|
||||
@ -90,9 +90,9 @@ class TestMultiplexAdapter : public VideoCodecUnitTest,
|
||||
for (int i = 0; i < 16; i++) {
|
||||
data[i] = i;
|
||||
}
|
||||
rtc::scoped_refptr<AugmentedVideoFrameBuffer> augmented_video_frame_buffer =
|
||||
new rtc::RefCountedObject<AugmentedVideoFrameBuffer>(
|
||||
video_buffer, std::move(data), 16);
|
||||
auto augmented_video_frame_buffer =
|
||||
rtc::make_ref_counted<AugmentedVideoFrameBuffer>(video_buffer,
|
||||
std::move(data), 16);
|
||||
return std::make_unique<VideoFrame>(
|
||||
VideoFrame::Builder()
|
||||
.set_video_frame_buffer(augmented_video_frame_buffer)
|
||||
|
||||
@ -74,13 +74,13 @@ class VideoCodecInitializerTest : public ::testing::Test {
|
||||
config_.number_of_streams = num_spatial_streams;
|
||||
VideoCodecVP8 vp8_settings = VideoEncoder::GetDefaultVp8Settings();
|
||||
vp8_settings.numberOfTemporalLayers = num_temporal_streams;
|
||||
config_.encoder_specific_settings = new rtc::RefCountedObject<
|
||||
config_.encoder_specific_settings = rtc::make_ref_counted<
|
||||
webrtc::VideoEncoderConfig::Vp8EncoderSpecificSettings>(vp8_settings);
|
||||
} else if (type == VideoCodecType::kVideoCodecVP9) {
|
||||
VideoCodecVP9 vp9_settings = VideoEncoder::GetDefaultVp9Settings();
|
||||
vp9_settings.numberOfSpatialLayers = num_spatial_streams;
|
||||
vp9_settings.numberOfTemporalLayers = num_temporal_streams;
|
||||
config_.encoder_specific_settings = new rtc::RefCountedObject<
|
||||
config_.encoder_specific_settings = rtc::make_ref_counted<
|
||||
webrtc::VideoEncoderConfig::Vp9EncoderSpecificSettings>(vp9_settings);
|
||||
} else if (type != VideoCodecType::kVideoCodecMultiplex) {
|
||||
ADD_FAILURE() << "Unexpected codec type: " << type;
|
||||
|
||||
Reference in New Issue
Block a user