From a68bfc5537fab1d32be9ec142a33c499b6784d37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Mon, 11 Jan 2021 13:26:35 +0100 Subject: [PATCH] Delete KeepBufferRefs helpers, and use of rtc::Bind. The rtc::Bind usages are replaced with lambdas with copy-capture of the ref pointers. Bug: webrtc:11339 Change-Id: I2fb544fcd2780feac3d725993c360df91899b532 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/201201 Reviewed-by: Stefan Holmer Reviewed-by: Danil Chapovalov Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#32946} --- common_video/libyuv/webrtc_libyuv.cc | 8 ++----- .../multiplex/multiplex_decoder_adapter.cc | 8 ++----- rtc_base/keep_ref_until_done.h | 12 +++-------- test/frame_generator.cc | 21 +++++++------------ 4 files changed, 14 insertions(+), 35 deletions(-) diff --git a/common_video/libyuv/webrtc_libyuv.cc b/common_video/libyuv/webrtc_libyuv.cc index c7613cefd8..f4fb15ea7a 100644 --- a/common_video/libyuv/webrtc_libyuv.cc +++ b/common_video/libyuv/webrtc_libyuv.cc @@ -14,7 +14,6 @@ #include "api/video/i420_buffer.h" #include "common_video/include/video_frame_buffer.h" -#include "rtc_base/bind.h" #include "rtc_base/checks.h" #include "third_party/libyuv/include/libyuv.h" @@ -138,10 +137,6 @@ int ConvertFromI420(const VideoFrame& src_frame, ConvertVideoType(dst_video_type)); } -// Helper functions for keeping references alive. -void KeepBufferRefs(rtc::scoped_refptr, - rtc::scoped_refptr) {} - rtc::scoped_refptr ScaleI420ABuffer( const I420ABufferInterface& buffer, int target_width, @@ -160,7 +155,8 @@ rtc::scoped_refptr ScaleI420ABuffer( yuv_buffer->StrideY(), yuv_buffer->DataU(), yuv_buffer->StrideU(), yuv_buffer->DataV(), yuv_buffer->StrideV(), axx_buffer->DataY(), axx_buffer->StrideY(), - rtc::Bind(&KeepBufferRefs, yuv_buffer, axx_buffer)); + // To keep references alive. + [yuv_buffer, axx_buffer] {}); return merged_buffer; } diff --git a/modules/video_coding/codecs/multiplex/multiplex_decoder_adapter.cc b/modules/video_coding/codecs/multiplex/multiplex_decoder_adapter.cc index 39c14e412c..426a9f80d1 100644 --- a/modules/video_coding/codecs/multiplex/multiplex_decoder_adapter.cc +++ b/modules/video_coding/codecs/multiplex/multiplex_decoder_adapter.cc @@ -20,11 +20,6 @@ #include "rtc_base/keep_ref_until_done.h" #include "rtc_base/logging.h" -namespace { -void KeepBufferRefs(rtc::scoped_refptr, - rtc::scoped_refptr) {} -} // anonymous namespace - namespace webrtc { class MultiplexDecoderAdapter::AdapterDecodedImageCallback @@ -250,7 +245,8 @@ void MultiplexDecoderAdapter::MergeAlphaImages( yuv_buffer->StrideY(), yuv_buffer->DataU(), yuv_buffer->StrideU(), yuv_buffer->DataV(), yuv_buffer->StrideV(), alpha_buffer->DataY(), alpha_buffer->StrideY(), - rtc::Bind(&KeepBufferRefs, yuv_buffer, alpha_buffer)); + // To keep references alive. + [yuv_buffer, alpha_buffer] {}); } if (supports_augmenting_data_) { merged_buffer = rtc::scoped_refptr( diff --git a/rtc_base/keep_ref_until_done.h b/rtc_base/keep_ref_until_done.h index 7bebd82374..5ae0ed1b21 100644 --- a/rtc_base/keep_ref_until_done.h +++ b/rtc_base/keep_ref_until_done.h @@ -12,29 +12,23 @@ #define RTC_BASE_KEEP_REF_UNTIL_DONE_H_ #include "api/scoped_refptr.h" -#include "rtc_base/bind.h" #include "rtc_base/callback.h" -#include "rtc_base/ref_count.h" namespace rtc { -namespace impl { -template -static inline void DoNothing(const scoped_refptr& object) {} -} // namespace impl - // KeepRefUntilDone keeps a reference to |object| until the returned // callback goes out of scope. If the returned callback is copied, the // reference will be released when the last callback goes out of scope. template static inline Callback0 KeepRefUntilDone(ObjectT* object) { - return rtc::Bind(&impl::DoNothing, scoped_refptr(object)); + scoped_refptr p(object); + return [p] {}; } template static inline Callback0 KeepRefUntilDone( const scoped_refptr& object) { - return rtc::Bind(&impl::DoNothing, object); + return [object] {}; } } // namespace rtc diff --git a/test/frame_generator.cc b/test/frame_generator.cc index 6c551d410c..4594e1de20 100644 --- a/test/frame_generator.cc +++ b/test/frame_generator.cc @@ -20,20 +20,12 @@ #include "api/video/video_rotation.h" #include "common_video/include/video_frame_buffer.h" #include "common_video/libyuv/include/webrtc_libyuv.h" -#include "rtc_base/bind.h" #include "rtc_base/checks.h" #include "rtc_base/keep_ref_until_done.h" #include "test/frame_utils.h" namespace webrtc { namespace test { -namespace { - -// Helper method for keeping a reference to passed pointers. -void KeepBufferRefs(rtc::scoped_refptr, - rtc::scoped_refptr) {} - -} // namespace SquareGenerator::SquareGenerator(int width, int height, @@ -81,12 +73,13 @@ FrameGeneratorInterface::VideoFrameData SquareGenerator::NextFrame() { CreateI420Buffer(width_, height_); rtc::scoped_refptr axx_buffer = CreateI420Buffer(width_, height_); - buffer = WrapI420ABuffer( - yuv_buffer->width(), yuv_buffer->height(), yuv_buffer->DataY(), - yuv_buffer->StrideY(), yuv_buffer->DataU(), yuv_buffer->StrideU(), - yuv_buffer->DataV(), yuv_buffer->StrideV(), axx_buffer->DataY(), - axx_buffer->StrideY(), - rtc::Bind(&KeepBufferRefs, yuv_buffer, axx_buffer)); + buffer = WrapI420ABuffer(yuv_buffer->width(), yuv_buffer->height(), + yuv_buffer->DataY(), yuv_buffer->StrideY(), + yuv_buffer->DataU(), yuv_buffer->StrideU(), + yuv_buffer->DataV(), yuv_buffer->StrideV(), + axx_buffer->DataY(), axx_buffer->StrideY(), + // To keep references alive. + [yuv_buffer, axx_buffer] {}); break; } default: