Commit af2a5eaf authored by henrika's avatar henrika Committed by Commit Bot

Minor modifications of WebRTC logs in UserMediaProcessor.

Trivial change which only cleans up WebRTC logs containing the string
"request_id=n". We used to mix "request_id=n" and "request_id = n" but
now all white-spaces are removed to make the logs more consistent and
easier to parse.

Bug: 1017219
Change-Id: I0aed5cccb7c77d14a63b8a972ae92ce748ba88cc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1878368Reviewed-by: default avatarGuido Urdaneta <guidou@chromium.org>
Commit-Queue: Henrik Andreasson <henrika@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709891}
parent 96bda47b
...@@ -517,7 +517,7 @@ void UserMediaProcessor::ProcessRequest( ...@@ -517,7 +517,7 @@ void UserMediaProcessor::ProcessRequest(
request_completed_cb_ = std::move(callback); request_completed_cb_ = std::move(callback);
current_request_info_ = MakeGarbageCollected<RequestInfo>(std::move(request)); current_request_info_ = MakeGarbageCollected<RequestInfo>(std::move(request));
blink::WebRtcLogMessage(base::StringPrintf( blink::WebRtcLogMessage(base::StringPrintf(
"UMP::ProcessRequest. request_id = %d. Has audio = %d. Has video = %d.", "UMP::ProcessRequest. request_id=%d. Has audio=%d. Has video=%d.",
current_request_info_->request_id(), current_request_info_->request_id(),
current_request_info_->request()->web_request.Audio(), current_request_info_->request()->web_request.Audio(),
current_request_info_->request()->web_request.Video())); current_request_info_->request()->web_request.Video()));
...@@ -534,7 +534,7 @@ void UserMediaProcessor::SetupAudioInput() { ...@@ -534,7 +534,7 @@ void UserMediaProcessor::SetupAudioInput() {
DCHECK(current_request_info_); DCHECK(current_request_info_);
DCHECK(current_request_info_->web_request().Audio()); DCHECK(current_request_info_->web_request().Audio());
blink::WebRtcLogMessage(base::StringPrintf( blink::WebRtcLogMessage(base::StringPrintf(
"UMP::SetupAudioInput. request_id = %d, audio constraints = %s", "UMP::SetupAudioInput. request_id=%d, audio constraints=%s",
current_request_info_->request_id(), current_request_info_->request_id(),
current_request_info_->request() current_request_info_->request()
->web_request.AudioConstraints() ->web_request.AudioConstraints()
...@@ -554,7 +554,7 @@ void UserMediaProcessor::SetupAudioInput() { ...@@ -554,7 +554,7 @@ void UserMediaProcessor::SetupAudioInput() {
if (blink::IsDeviceMediaType(audio_controls.stream_type)) { if (blink::IsDeviceMediaType(audio_controls.stream_type)) {
blink::WebRtcLogMessage( blink::WebRtcLogMessage(
base::StringPrintf("UMP::SetupAudioInput. request_id = %d, " base::StringPrintf("UMP::SetupAudioInput. request_id=%d, "
"Requesting device capabilities", "Requesting device capabilities",
current_request_info_->request_id())); current_request_info_->request_id()));
GetMediaDevicesDispatcher()->GetAudioInputCapabilities(WTF::Bind( GetMediaDevicesDispatcher()->GetAudioInputCapabilities(WTF::Bind(
...@@ -623,7 +623,7 @@ void UserMediaProcessor::SelectAudioSettings( ...@@ -623,7 +623,7 @@ void UserMediaProcessor::SelectAudioSettings(
DCHECK(current_request_info_->stream_controls()->audio.requested); DCHECK(current_request_info_->stream_controls()->audio.requested);
blink::WebRtcLogMessage( blink::WebRtcLogMessage(
base::StringPrintf("UMP::SelectAudioSettings. request_id = %d.", base::StringPrintf("UMP::SelectAudioSettings. request_id=%d.",
current_request_info_->request_id())); current_request_info_->request_id()));
auto settings = SelectSettingsAudioCapture( auto settings = SelectSettingsAudioCapture(
capabilities, web_request.AudioConstraints(), capabilities, web_request.AudioConstraints(),
...@@ -702,7 +702,7 @@ void UserMediaProcessor::SetupVideoInput() { ...@@ -702,7 +702,7 @@ void UserMediaProcessor::SetupVideoInput() {
return; return;
} }
blink::WebRtcLogMessage(base::StringPrintf( blink::WebRtcLogMessage(base::StringPrintf(
"UMP::SetupVideoInput. request_id = %d, video constraints = %s", "UMP::SetupVideoInput. request_id=%d, video constraints=%s",
current_request_info_->request_id(), current_request_info_->request_id(),
current_request_info_->request() current_request_info_->request()
->web_request.VideoConstraints() ->web_request.VideoConstraints()
...@@ -748,7 +748,7 @@ void UserMediaProcessor::SelectVideoDeviceSettings( ...@@ -748,7 +748,7 @@ void UserMediaProcessor::SelectVideoDeviceSettings(
DCHECK(blink::IsDeviceMediaType( DCHECK(blink::IsDeviceMediaType(
current_request_info_->stream_controls()->video.stream_type)); current_request_info_->stream_controls()->video.stream_type));
blink::WebRtcLogMessage( blink::WebRtcLogMessage(
base::StringPrintf("UMP::SelectVideoDeviceSettings. request_id = %d.", base::StringPrintf("UMP::SelectVideoDeviceSettings. request_id=%d.",
current_request_info_->request_id())); current_request_info_->request_id()));
blink::VideoDeviceCaptureCapabilities capabilities; blink::VideoDeviceCaptureCapabilities capabilities;
...@@ -792,7 +792,7 @@ void UserMediaProcessor::SelectVideoContentSettings() { ...@@ -792,7 +792,7 @@ void UserMediaProcessor::SelectVideoContentSettings() {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
DCHECK(current_request_info_); DCHECK(current_request_info_);
blink::WebRtcLogMessage( blink::WebRtcLogMessage(
base::StringPrintf("UMP::SelectVideoContentSettings. request_id = %d.", base::StringPrintf("UMP::SelectVideoContentSettings. request_id=%d.",
current_request_info_->request_id())); current_request_info_->request_id()));
gfx::Size screen_size = GetScreenSize(); gfx::Size screen_size = GetScreenSize();
blink::VideoCaptureSettings settings = blink::VideoCaptureSettings settings =
...@@ -882,7 +882,7 @@ void UserMediaProcessor::OnStreamGenerated( ...@@ -882,7 +882,7 @@ void UserMediaProcessor::OnStreamGenerated(
return; return;
} }
blink::WebRtcLogMessage( blink::WebRtcLogMessage(
base::StringPrintf("UMP::OnStreamGenerated. request_id = %d.", base::StringPrintf("UMP::OnStreamGenerated. request_id=%d.",
current_request_info_->request_id())); current_request_info_->request_id()));
current_request_info_->set_state(RequestInfo::State::GENERATED); current_request_info_->set_state(RequestInfo::State::GENERATED);
...@@ -1033,7 +1033,7 @@ void UserMediaProcessor::OnStreamGenerationFailed( ...@@ -1033,7 +1033,7 @@ void UserMediaProcessor::OnStreamGenerationFailed(
return; return;
} }
blink::WebRtcLogMessage( blink::WebRtcLogMessage(
base::StringPrintf("UMP::OnStreamGenerationFailed. request_id = %d.", base::StringPrintf("UMP::OnStreamGenerationFailed. request_id=%d.",
current_request_info_->request_id())); current_request_info_->request_id()));
GetUserMediaRequestFailed(result); GetUserMediaRequestFailed(result);
......
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