Add move operations to VideoEncoder::EncoderInfo EncoderInfo declares a copy constructor and a destructor, so it has no implicit move operations, and std::move on an EncoderInfo copies it. For example, the EncoderContext constructor in SimulcastEncoderAdapter and the EncoderSettings constructor take EncoderInfo by value and move it into a member, which made a copy. Add a defaulted move constructor and move assignment operator, and declare the copy assignment operator, which declaring a move constructor would otherwise delete. Like the existing copy constructor and destructor, they are defaulted out of line. Also move the primary and fallback infos into the new EncoderContext in SimulcastEncoderAdapter::FetchOrCreateEncoderContext, as they are not used afterwards. Creating an encoder context now copies EncoderInfo once instead of six times. Bug: webrtc:374845009 Change-Id: I77cd7211314a62fd12a871e4b88d081ab858bbb7 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/507722 Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Commit-Queue: Fredrik Solenberg <solenberg@webrtc.org> Cr-Commit-Position: refs/heads/main@{#48816}
diff --git a/api/video_codecs/video_encoder.cc b/api/video_codecs/video_encoder.cc index 79c6437..24167e3 100644 --- a/api/video_codecs/video_encoder.cc +++ b/api/video_codecs/video_encoder.cc
@@ -110,6 +110,11 @@ preferred_pixel_formats{VideoFrameBuffer::Type::kI420} {} VideoEncoder::EncoderInfo::EncoderInfo(const EncoderInfo&) = default; +VideoEncoder::EncoderInfo::EncoderInfo(EncoderInfo&&) = default; +VideoEncoder::EncoderInfo& VideoEncoder::EncoderInfo::operator=( + const EncoderInfo&) = default; +VideoEncoder::EncoderInfo& VideoEncoder::EncoderInfo::operator=(EncoderInfo&&) = + default; VideoEncoder::EncoderInfo::~EncoderInfo() = default;
diff --git a/api/video_codecs/video_encoder.h b/api/video_codecs/video_encoder.h index b5cbd8a..dce07c3 100644 --- a/api/video_codecs/video_encoder.h +++ b/api/video_codecs/video_encoder.h
@@ -161,6 +161,9 @@ EncoderInfo(); EncoderInfo(const EncoderInfo&); + EncoderInfo(EncoderInfo&&); + EncoderInfo& operator=(const EncoderInfo&); + EncoderInfo& operator=(EncoderInfo&&); ~EncoderInfo();
diff --git a/media/engine/simulcast_encoder_adapter.cc b/media/engine/simulcast_encoder_adapter.cc index 4a3fdf7..83680f9 100644 --- a/media/engine/simulcast_encoder_adapter.cc +++ b/media/engine/simulcast_encoder_adapter.cc
@@ -973,8 +973,8 @@ } encoder_context = std::make_unique<SimulcastEncoderAdapter::EncoderContext>( - std::move(encoder), prefer_temporal_support, primary_info, - fallback_info, std::move(video_format)); + std::move(encoder), prefer_temporal_support, std::move(primary_info), + std::move(fallback_info), std::move(video_format)); } encoder_context->encoder().RegisterEncodeCompleteCallback(