From 9cc5fffee150b3160714de2c9b07ad3c28728d8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Fri, 11 Feb 2022 09:30:26 +0100 Subject: [PATCH] Convert a few more uses of rtc::split to use string_view Bug: webrtc:13579 Change-Id: I84bdb908bf390924c6d67cd1c5aabcc9e62f33da Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/251581 Reviewed-by: Mirko Bonadei Reviewed-by: Harald Alvestrand Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/main@{#35976} --- media/engine/webrtc_voice_engine.cc | 4 ++-- modules/desktop_capture/linux/wayland/egl_dmabuf.cc | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/media/engine/webrtc_voice_engine.cc b/media/engine/webrtc_voice_engine.cc index 69fd238601..b7b0ad78d6 100644 --- a/media/engine/webrtc_voice_engine.cc +++ b/media/engine/webrtc_voice_engine.cc @@ -1666,8 +1666,8 @@ bool CheckRedParameters( RTC_LOG(LS_WARNING) << "audio/RED missing fmtp parameters."; return false; } - std::vector redundant_payloads; - rtc::split(red_parameters->second, '/', &redundant_payloads); + std::vector redundant_payloads = + rtc::split(red_parameters->second, '/'); // 32 is chosen as a maximum upper bound for consistency with the // red payload splitter. if (redundant_payloads.size() < 2 || redundant_payloads.size() > 32) { diff --git a/modules/desktop_capture/linux/wayland/egl_dmabuf.cc b/modules/desktop_capture/linux/wayland/egl_dmabuf.cc index a4de19d1ad..088d1c4ea4 100644 --- a/modules/desktop_capture/linux/wayland/egl_dmabuf.cc +++ b/modules/desktop_capture/linux/wayland/egl_dmabuf.cc @@ -327,9 +327,8 @@ EglDmaBuf::EglDmaBuf() { return; } - std::vector client_extensions_no_display; - rtc::split(client_extensions_cstring_no_display, ' ', - &client_extensions_no_display); + std::vector client_extensions_no_display = + rtc::split(client_extensions_cstring_no_display, ' '); for (const auto& extension : client_extensions_no_display) { egl_.extensions.push_back(std::string(extension)); } @@ -388,8 +387,8 @@ EglDmaBuf::EglDmaBuf() { EglQueryString(egl_.display, EGL_EXTENSIONS); client_extensions_string = client_extensions_cstring_display; - std::vector client_extensions; - rtc::split(client_extensions_string, ' ', &client_extensions); + std::vector client_extensions = + rtc::split(client_extensions_string, ' '); for (const auto& extension : client_extensions) { egl_.extensions.push_back(std::string(extension)); }