Commit 79ea4f7e authored by Shik Chen's avatar Shik Chen Committed by Commit Bot

Remove the usage of banned function std::to_string.

Quote form the presubmit checks of std::to_string [1]:
> std::to_string is locale dependent and slower than alternatives.  For
> locale-independent strings, e.g. writing numbers to and from disk
> profiles, use base::NumberToString().  For user-visible strings, use
> base::FormatNumber() and the related functions in
> base/i18n/number_formatting.h.

[1] https://cs.chromium.org/chromium/src/PRESUBMIT.py?l=719&rcl=fdd20c8546766e53c8369523080e79b9e60cac7b

Bug: None
Test: Passes capture_unittests.
Change-Id: Iaad9cfdedd5efb55c0a2f411ca505be127dedffa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1660389Reviewed-by: default avatarWei Lee <wtlee@chromium.org>
Commit-Queue: Shik Chen <shik@chromium.org>
Cr-Commit-Position: refs/heads/master@{#669966}
parent 3fb285c9
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "base/bind_helpers.h" #include "base/bind_helpers.h"
#include "base/numerics/ranges.h" #include "base/numerics/ranges.h"
#include "base/posix/safe_strerror.h" #include "base/posix/safe_strerror.h"
#include "base/strings/string_number_conversions.h"
#include "base/trace_event/trace_event.h" #include "base/trace_event/trace_event.h"
#include "media/base/bind_to_current_loop.h" #include "media/base/bind_to_current_loop.h"
#include "media/capture/mojom/image_capture_types.h" #include "media/capture/mojom/image_capture_types.h"
...@@ -120,7 +121,7 @@ std::string StreamTypeToString(StreamType stream_type) { ...@@ -120,7 +121,7 @@ std::string StreamTypeToString(StreamType stream_type) {
return std::string("StreamType::kYUVOutput"); return std::string("StreamType::kYUVOutput");
default: default:
return std::string("Unknown StreamType value: ") + return std::string("Unknown StreamType value: ") +
std::to_string(static_cast<int32_t>(stream_type)); base::NumberToString(static_cast<int32_t>(stream_type));
} }
} // namespace media } // namespace media
...@@ -641,7 +642,7 @@ void CameraDeviceDelegate::OnConfiguredStreams( ...@@ -641,7 +642,7 @@ void CameraDeviceDelegate::OnConfiguredStreams(
kCrosHalV3DeviceDelegateWrongNumberOfStreamsConfigured, kCrosHalV3DeviceDelegateWrongNumberOfStreamsConfigured,
FROM_HERE, FROM_HERE,
std::string("Wrong number of streams configured: ") + std::string("Wrong number of streams configured: ") +
std::to_string(updated_config->streams.size())); base::NumberToString(updated_config->streams.size()));
return; return;
} }
......
...@@ -215,9 +215,9 @@ TEST_F(CameraHalDelegateTest, GetBuiltinCameraInfo) { ...@@ -215,9 +215,9 @@ TEST_F(CameraHalDelegateTest, GetBuiltinCameraInfo) {
ASSERT_EQ(3u, descriptors.size()); ASSERT_EQ(3u, descriptors.size());
// We have workaround to always put front camera at first. // We have workaround to always put front camera at first.
ASSERT_EQ(std::to_string(1), descriptors[0].device_id); ASSERT_EQ("1", descriptors[0].device_id);
ASSERT_EQ(VideoFacingMode::MEDIA_VIDEO_FACING_USER, descriptors[0].facing); ASSERT_EQ(VideoFacingMode::MEDIA_VIDEO_FACING_USER, descriptors[0].facing);
ASSERT_EQ(std::to_string(0), descriptors[1].device_id); ASSERT_EQ("0", descriptors[1].device_id);
ASSERT_EQ(VideoFacingMode::MEDIA_VIDEO_FACING_ENVIRONMENT, ASSERT_EQ(VideoFacingMode::MEDIA_VIDEO_FACING_ENVIRONMENT,
descriptors[1].facing); descriptors[1].facing);
ASSERT_EQ(kFakeDevicePath, descriptors[2].device_id); ASSERT_EQ(kFakeDevicePath, descriptors[2].device_id);
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/bind_helpers.h" #include "base/bind_helpers.h"
#include "base/posix/safe_strerror.h" #include "base/posix/safe_strerror.h"
#include "base/strings/string_number_conversions.h"
#include "base/trace_event/trace_event.h" #include "base/trace_event/trace_event.h"
#include "media/capture/video/chromeos/camera_buffer_factory.h" #include "media/capture/video/chromeos/camera_buffer_factory.h"
#include "media/capture/video/chromeos/camera_device_context.h" #include "media/capture/video/chromeos/camera_device_context.h"
...@@ -374,7 +375,7 @@ void RequestManager::ProcessCaptureResult( ...@@ -374,7 +375,7 @@ void RequestManager::ProcessCaptureResult(
kCrosHalV3BufferManagerInvalidPendingResultId, kCrosHalV3BufferManagerInvalidPendingResultId,
FROM_HERE, FROM_HERE,
std::string("Invalid pending_result id: ") + std::string("Invalid pending_result id: ") +
std::to_string(result_id)); base::NumberToString(result_id));
return; return;
} }
if (pending_result.partial_metadata_received.count(result_id)) { if (pending_result.partial_metadata_received.count(result_id)) {
...@@ -383,7 +384,7 @@ void RequestManager::ProcessCaptureResult( ...@@ -383,7 +384,7 @@ void RequestManager::ProcessCaptureResult(
kCrosHalV3BufferManagerReceivedDuplicatedPartialMetadata, kCrosHalV3BufferManagerReceivedDuplicatedPartialMetadata,
FROM_HERE, FROM_HERE,
std::string("Received duplicated partial metadata: ") + std::string("Received duplicated partial metadata: ") +
std::to_string(result_id)); base::NumberToString(result_id));
return; return;
} }
DVLOG(2) << "Received partial result " << result_id << " for frame " DVLOG(2) << "Received partial result " << result_id << " for frame "
...@@ -399,7 +400,7 @@ void RequestManager::ProcessCaptureResult( ...@@ -399,7 +400,7 @@ void RequestManager::ProcessCaptureResult(
kCrosHalV3BufferManagerIncorrectNumberOfOutputBuffersReceived, kCrosHalV3BufferManagerIncorrectNumberOfOutputBuffersReceived,
FROM_HERE, FROM_HERE,
std::string("Incorrect number of output buffers received: ") + std::string("Incorrect number of output buffers received: ") +
std::to_string(result->output_buffers->size())); base::NumberToString(result->output_buffers->size()));
return; return;
} }
...@@ -413,7 +414,7 @@ void RequestManager::ProcessCaptureResult( ...@@ -413,7 +414,7 @@ void RequestManager::ProcessCaptureResult(
kCrosHalV3BufferManagerInvalidTypeOfOutputBuffersReceived, kCrosHalV3BufferManagerInvalidTypeOfOutputBuffersReceived,
FROM_HERE, FROM_HERE,
std::string("Invalid type of output buffers received: ") + std::string("Invalid type of output buffers received: ") +
std::to_string(stream_buffer->stream_id)); base::NumberToString(stream_buffer->stream_id));
return; return;
} }
...@@ -429,8 +430,9 @@ void RequestManager::ProcessCaptureResult( ...@@ -429,8 +430,9 @@ void RequestManager::ProcessCaptureResult(
kCrosHalV3BufferManagerReceivedMultipleResultBuffersForFrame, kCrosHalV3BufferManagerReceivedMultipleResultBuffersForFrame,
FROM_HERE, FROM_HERE,
std::string("Received multiple result buffers for frame ") + std::string("Received multiple result buffers for frame ") +
std::to_string(frame_number) + std::string(" for stream ") + base::NumberToString(frame_number) +
std::to_string(stream_buffer->stream_id)); std::string(" for stream ") +
base::NumberToString(stream_buffer->stream_id));
return; return;
} else if (last_received_frame_number_map_[stream_type] > } else if (last_received_frame_number_map_[stream_type] >
frame_number) { frame_number) {
...@@ -440,8 +442,10 @@ void RequestManager::ProcessCaptureResult( ...@@ -440,8 +442,10 @@ void RequestManager::ProcessCaptureResult(
FROM_HERE, FROM_HERE,
std::string("Received frame is out-of-order; expect frame number " std::string("Received frame is out-of-order; expect frame number "
"greater than ") + "greater than ") +
std::to_string(last_received_frame_number_map_[stream_type]) + base::NumberToString(
std::string(" but got ") + std::to_string(frame_number)); last_received_frame_number_map_[stream_type]) +
std::string(" but got ") +
base::NumberToString(frame_number));
} else { } else {
last_received_frame_number_map_[stream_type] = frame_number; last_received_frame_number_map_[stream_type] = frame_number;
} }
...@@ -511,7 +515,7 @@ void RequestManager::Notify(cros::mojom::Camera3NotifyMsgPtr message) { ...@@ -511,7 +515,7 @@ void RequestManager::Notify(cros::mojom::Camera3NotifyMsgPtr message) {
kCrosHalV3BufferManagerUnknownStreamInCamera3NotifyMsg, kCrosHalV3BufferManagerUnknownStreamInCamera3NotifyMsg,
FROM_HERE, FROM_HERE,
std::string("Unknown stream in Camera3NotifyMsg: ") + std::string("Unknown stream in Camera3NotifyMsg: ") +
std::to_string(error_stream_id)); base::NumberToString(error_stream_id));
return; return;
} }
cros::mojom::Camera3ErrorMsgCode error_code = error->error_code; cros::mojom::Camera3ErrorMsgCode error_code = error->error_code;
...@@ -528,7 +532,7 @@ void RequestManager::Notify(cros::mojom::Camera3NotifyMsgPtr message) { ...@@ -528,7 +532,7 @@ void RequestManager::Notify(cros::mojom::Camera3NotifyMsgPtr message) {
kCrosHalV3BufferManagerReceivedInvalidShutterTime, kCrosHalV3BufferManagerReceivedInvalidShutterTime,
FROM_HERE, FROM_HERE,
std::string("Received invalid shutter time: ") + std::string("Received invalid shutter time: ") +
std::to_string(shutter_time)); base::NumberToString(shutter_time));
return; return;
} }
CaptureResult& pending_result = pending_results_[frame_number]; CaptureResult& pending_result = pending_results_[frame_number];
...@@ -573,7 +577,7 @@ void RequestManager::HandleNotifyError( ...@@ -573,7 +577,7 @@ void RequestManager::HandleNotifyError(
// buffers will be reused in SubmitCaptureResult. // buffers will be reused in SubmitCaptureResult.
warning_msg = warning_msg =
std::string("An error occurred while processing request for frame ") + std::string("An error occurred while processing request for frame ") +
std::to_string(frame_number); base::NumberToString(frame_number);
break; break;
case cros::mojom::Camera3ErrorMsgCode::CAMERA3_MSG_ERROR_RESULT: case cros::mojom::Camera3ErrorMsgCode::CAMERA3_MSG_ERROR_RESULT:
...@@ -583,7 +587,7 @@ void RequestManager::HandleNotifyError( ...@@ -583,7 +587,7 @@ void RequestManager::HandleNotifyError(
warning_msg = std::string( warning_msg = std::string(
"An error occurred while producing result " "An error occurred while producing result "
"metadata for frame ") + "metadata for frame ") +
std::to_string(frame_number); base::NumberToString(frame_number);
break; break;
case cros::mojom::Camera3ErrorMsgCode::CAMERA3_MSG_ERROR_BUFFER: case cros::mojom::Camera3ErrorMsgCode::CAMERA3_MSG_ERROR_BUFFER:
...@@ -598,7 +602,7 @@ void RequestManager::HandleNotifyError( ...@@ -598,7 +602,7 @@ void RequestManager::HandleNotifyError(
warning_msg = warning_msg =
std::string( std::string(
"An error occurred while filling output buffer for frame ") + "An error occurred while filling output buffer for frame ") +
std::to_string(frame_number); base::NumberToString(frame_number);
break; break;
default: default:
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/posix/safe_strerror.h" #include "base/posix/safe_strerror.h"
#include "base/strings/string_number_conversions.h"
#include "base/trace_event/trace_event.h" #include "base/trace_event/trace_event.h"
#include "media/capture/video/chromeos/camera_buffer_factory.h" #include "media/capture/video/chromeos/camera_buffer_factory.h"
#include "media/capture/video/chromeos/camera_device_context.h" #include "media/capture/video/chromeos/camera_device_context.h"
...@@ -102,7 +103,7 @@ void StreamBufferManager::SetUpStreamsAndBuffers( ...@@ -102,7 +103,7 @@ void StreamBufferManager::SetUpStreamsAndBuffers(
kCrosHalV3BufferManagerHalRequestedTooManyBuffers, kCrosHalV3BufferManagerHalRequestedTooManyBuffers,
FROM_HERE, FROM_HERE,
std::string("Camera HAL requested ") + std::string("Camera HAL requested ") +
std::to_string(stream->max_buffers) + base::NumberToString(stream->max_buffers) +
std::string(" buffers which exceeds the allowed maximum " std::string(" buffers which exceeds the allowed maximum "
"number of buffers")); "number of buffers"));
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment