Skip to content

Commit

Permalink
Don't assume that RTC_LOG's << operator is std::ostream
Browse files Browse the repository at this point in the history 
Bug: webrtc:8982, webrtc:9185
Change-Id: I8a88c10725508f7ea8a7f46e8bcdac4afdb2c617
Reviewed-on: https://webrtc-review.googlesource.com/77681
Reviewed-by: Jonas Olsson <[email protected]>
Reviewed-by: Oskar Sundbom <[email protected]>
Commit-Queue: Karl Wiberg <[email protected]>
Cr-Commit-Position: refs/heads/master@{#23359}
  • Loading branch information
Karl Wiberg authored and Commit Bot committed May 23, 2018
1 parent a041f92 commit 4343273
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 48 deletions.
7 changes: 4 additions & 3 deletions media/sctp/sctptransport.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ enum PreservedErrno {
#include "rtc_base/helpers.h"
#include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/stringutils.h"
#include "rtc_base/thread_checker.h"
#include "rtc_base/trace_event.h"
#include "usrsctplib/usrsctp.h"
Expand Down Expand Up @@ -312,8 +313,8 @@ class SctpTransport::UsrSctpWrapper {
SctpTransport* transport = static_cast<SctpTransport*>(addr);
RTC_LOG(LS_VERBOSE) << "global OnSctpOutboundPacket():"
<< "addr: " << addr << "; length: " << length
<< "; tos: " << std::hex << static_cast<int>(tos)
<< "; set_df: " << std::hex << static_cast<int>(set_df);
<< "; tos: " << rtc::ToHex(tos)
<< "; set_df: " << rtc::ToHex(set_df);

VerboseLogPacket(data, length, SCTP_DUMP_OUTBOUND);
// Note: We have to copy the data; the caller will delete it.
Expand Down Expand Up @@ -1056,7 +1057,7 @@ void SctpTransport::OnStreamResetEvent(
const int num_sids = (evt->strreset_length - sizeof(*evt)) /
sizeof(evt->strreset_stream_list[0]);
RTC_LOG(LS_VERBOSE) << "SCTP_STREAM_RESET_EVENT(" << debug_name_
<< "): Flags = 0x" << std::hex << evt->strreset_flags
<< "): Flags = 0x" << rtc::ToHex(evt->strreset_flags)
<< " (" << ListFlags(evt->strreset_flags) << ")";
RTC_LOG(LS_VERBOSE) << "Assoc = " << evt->strreset_assoc_id << ", Streams = ["
<< ListArray(evt->strreset_stream_list, num_sids)
Expand Down
49 changes: 25 additions & 24 deletions modules/audio_device/win/audio_device_core_win.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@

#include "rtc_base/logging.h"
#include "rtc_base/platform_thread.h"
#include "rtc_base/stringutils.h"
#include "rtc_base/thread_annotations.h"
#include "system_wrappers/include/sleep.h"

Expand Down Expand Up @@ -1872,8 +1873,8 @@ int32_t AudioDeviceWindowsCore::InitPlayout() {
if (SUCCEEDED(hr)) {
RTC_LOG(LS_VERBOSE) << "Audio Engine's current rendering mix format:";
// format type
RTC_LOG(LS_VERBOSE) << "wFormatTag : 0x" << std::hex
<< pWfxOut->wFormatTag << std::dec << " ("
RTC_LOG(LS_VERBOSE) << "wFormatTag : 0x"
<< rtc::ToHex(pWfxOut->wFormatTag) << " ("
<< pWfxOut->wFormatTag << ")";
// number of channels (i.e. mono, stereo...)
RTC_LOG(LS_VERBOSE) << "nChannels : " << pWfxOut->nChannels;
Expand Down Expand Up @@ -1947,8 +1948,8 @@ int32_t AudioDeviceWindowsCore::InitPlayout() {
_playChannels = Wfx.nChannels;

RTC_LOG(LS_VERBOSE) << "VoE selected this rendering format:";
RTC_LOG(LS_VERBOSE) << "wFormatTag : 0x" << std::hex
<< Wfx.wFormatTag << std::dec << " (" << Wfx.wFormatTag
RTC_LOG(LS_VERBOSE) << "wFormatTag : 0x"
<< rtc::ToHex(Wfx.wFormatTag) << " (" << Wfx.wFormatTag
<< ")";
RTC_LOG(LS_VERBOSE) << "nChannels : " << Wfx.nChannels;
RTC_LOG(LS_VERBOSE) << "nSamplesPerSec : " << Wfx.nSamplesPerSec;
Expand Down Expand Up @@ -2189,8 +2190,8 @@ int32_t AudioDeviceWindowsCore::InitRecording() {
if (SUCCEEDED(hr)) {
RTC_LOG(LS_VERBOSE) << "Audio Engine's current capturing mix format:";
// format type
RTC_LOG(LS_VERBOSE) << "wFormatTag : 0x" << std::hex
<< pWfxIn->wFormatTag << std::dec << " ("
RTC_LOG(LS_VERBOSE) << "wFormatTag : 0x"
<< rtc::ToHex(pWfxIn->wFormatTag) << " ("
<< pWfxIn->wFormatTag << ")";
// number of channels (i.e. mono, stereo...)
RTC_LOG(LS_VERBOSE) << "nChannels : " << pWfxIn->nChannels;
Expand Down Expand Up @@ -2262,8 +2263,8 @@ int32_t AudioDeviceWindowsCore::InitRecording() {
_recChannels = Wfx.Format.nChannels;

RTC_LOG(LS_VERBOSE) << "VoE selected this capturing format:";
RTC_LOG(LS_VERBOSE) << "wFormatTag : 0x" << std::hex
<< Wfx.Format.wFormatTag << std::dec << " ("
RTC_LOG(LS_VERBOSE) << "wFormatTag : 0x"
<< rtc::ToHex(Wfx.Format.wFormatTag) << " ("
<< Wfx.Format.wFormatTag << ")";
RTC_LOG(LS_VERBOSE) << "nChannels : " << Wfx.Format.nChannels;
RTC_LOG(LS_VERBOSE) << "nSamplesPerSec : " << Wfx.Format.nSamplesPerSec;
Expand Down Expand Up @@ -3327,8 +3328,8 @@ DWORD AudioDeviceWindowsCore::DoCaptureThread() {
// IAudioClient::Stop, IAudioClient::Reset, and releasing the audio
// client.
RTC_LOG(LS_ERROR) << "IAudioCaptureClient::GetBuffer returned"
<< " AUDCLNT_E_BUFFER_ERROR, hr = 0x" << std::hex
<< hr << std::dec;
<< " AUDCLNT_E_BUFFER_ERROR, hr = 0x"
<< rtc::ToHex(hr);
goto Exit;
}

Expand Down Expand Up @@ -3841,7 +3842,7 @@ int32_t AudioDeviceWindowsCore::_GetDeviceName(IMMDevice* pDevice,
hr = pDevice->OpenPropertyStore(STGM_READ, &pProps);
if (FAILED(hr)) {
RTC_LOG(LS_ERROR) << "IMMDevice::OpenPropertyStore failed, hr = 0x"
<< std::hex << hr << std::dec;
<< rtc::ToHex(hr);
}
}

Expand All @@ -3853,21 +3854,21 @@ int32_t AudioDeviceWindowsCore::_GetDeviceName(IMMDevice* pDevice,
hr = pProps->GetValue(PKEY_Device_FriendlyName, &varName);
if (FAILED(hr)) {
RTC_LOG(LS_ERROR) << "IPropertyStore::GetValue failed, hr = 0x"
<< std::hex << hr << std::dec;
<< rtc::ToHex(hr);
}
}

if ((SUCCEEDED(hr)) && (VT_EMPTY == varName.vt)) {
hr = E_FAIL;
RTC_LOG(LS_ERROR) << "IPropertyStore::GetValue returned no value,"
<< " hr = 0x" << std::hex << hr << std::dec;
<< " hr = 0x" << rtc::ToHex(hr);
}

if ((SUCCEEDED(hr)) && (VT_LPWSTR != varName.vt)) {
// The returned value is not a wide null terminated string.
hr = E_UNEXPECTED;
RTC_LOG(LS_ERROR) << "IPropertyStore::GetValue returned unexpected"
<< " type, hr = 0x" << std::hex << hr << std::dec;
<< " type, hr = 0x" << rtc::ToHex(hr);
}

if (SUCCEEDED(hr) && (varName.pwszVal != NULL)) {
Expand Down Expand Up @@ -4056,16 +4057,16 @@ int32_t AudioDeviceWindowsCore::_EnumerateEndpointDevicesAll(
hr = pEndpoint->GetState(&dwState);
CONTINUE_ON_ERROR(hr);
if (dwState & DEVICE_STATE_ACTIVE)
RTC_LOG(LS_VERBOSE) << "state (0x" << std::hex << dwState << std::dec
RTC_LOG(LS_VERBOSE) << "state (0x" << rtc::ToHex(dwState)
<< ") : *ACTIVE*";
if (dwState & DEVICE_STATE_DISABLED)
RTC_LOG(LS_VERBOSE) << "state (0x" << std::hex << dwState << std::dec
RTC_LOG(LS_VERBOSE) << "state (0x" << rtc::ToHex(dwState)
<< ") : DISABLED";
if (dwState & DEVICE_STATE_NOTPRESENT)
RTC_LOG(LS_VERBOSE) << "state (0x" << std::hex << dwState << std::dec
RTC_LOG(LS_VERBOSE) << "state (0x" << rtc::ToHex(dwState)
<< ") : NOTPRESENT";
if (dwState & DEVICE_STATE_UNPLUGGED)
RTC_LOG(LS_VERBOSE) << "state (0x" << std::hex << dwState << std::dec
RTC_LOG(LS_VERBOSE) << "state (0x" << rtc::ToHex(dwState)
<< ") : UNPLUGGED";

// Check the hardware volume capabilities.
Expand All @@ -4077,16 +4078,16 @@ int32_t AudioDeviceWindowsCore::_EnumerateEndpointDevicesAll(
CONTINUE_ON_ERROR(hr);
if (dwHwSupportMask & ENDPOINT_HARDWARE_SUPPORT_VOLUME)
// The audio endpoint device supports a hardware volume control
RTC_LOG(LS_VERBOSE) << "hwmask (0x" << std::hex << dwHwSupportMask
<< std::dec << ") : HARDWARE_SUPPORT_VOLUME";
RTC_LOG(LS_VERBOSE) << "hwmask (0x" << rtc::ToHex(dwHwSupportMask)
<< ") : HARDWARE_SUPPORT_VOLUME";
if (dwHwSupportMask & ENDPOINT_HARDWARE_SUPPORT_MUTE)
// The audio endpoint device supports a hardware mute control
RTC_LOG(LS_VERBOSE) << "hwmask (0x" << std::hex << dwHwSupportMask
<< std::dec << ") : HARDWARE_SUPPORT_MUTE";
RTC_LOG(LS_VERBOSE) << "hwmask (0x" << rtc::ToHex(dwHwSupportMask)
<< ") : HARDWARE_SUPPORT_MUTE";
if (dwHwSupportMask & ENDPOINT_HARDWARE_SUPPORT_METER)
// The audio endpoint device supports a hardware peak meter
RTC_LOG(LS_VERBOSE) << "hwmask (0x" << std::hex << dwHwSupportMask
<< std::dec << ") : HARDWARE_SUPPORT_METER";
RTC_LOG(LS_VERBOSE) << "hwmask (0x" << rtc::ToHex(dwHwSupportMask)
<< ") : HARDWARE_SUPPORT_METER";

// Check the channel count (#channels in the audio stream that enters or
// leaves the audio endpoint device)
Expand Down
2 changes: 1 addition & 1 deletion modules/pacing/paced_sender.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ void PacedSender::Process() {
}

void PacedSender::ProcessThreadAttached(ProcessThread* process_thread) {
RTC_LOG(LS_INFO) << "ProcessThreadAttached 0x" << std::hex << process_thread;
RTC_LOG(LS_INFO) << "ProcessThreadAttached 0x" << process_thread;
rtc::CritScope cs(&process_thread_lock_);
process_thread_ = process_thread;
}
Expand Down
11 changes: 5 additions & 6 deletions modules/video_capture/windows/device_info_ds.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@

#include "modules/video_capture/windows/device_info_ds.h"

#include <ios> // std::hex

#include "modules/video_capture/video_capture_config.h"
#include "modules/video_capture/windows/help_functions_ds.h"
#include "rtc_base/logging.h"
#include "rtc_base/stringutils.h"

#include <dvdmedia.h>
#include <streams.h>
Expand Down Expand Up @@ -75,7 +74,7 @@ DeviceInfoDS::DeviceInfoDS()
//
RTC_LOG(LS_INFO) << __FUNCTION__
<< ": CoInitializeEx(NULL, COINIT_APARTMENTTHREADED)"
<< " => RPC_E_CHANGED_MODE, error 0x" << std::hex << hr;
<< " => RPC_E_CHANGED_MODE, error 0x" << rtc::ToHex(hr);
}
}
}
Expand All @@ -93,7 +92,7 @@ int32_t DeviceInfoDS::Init() {
IID_ICreateDevEnum, (void**)&_dsDevEnum);
if (hr != NOERROR) {
RTC_LOG(LS_INFO) << "Failed to create CLSID_SystemDeviceEnum, error 0x"
<< std::hex << hr;
<< rtc::ToHex(hr);
return -1;
}
return 0;
Expand Down Expand Up @@ -132,7 +131,7 @@ int32_t DeviceInfoDS::GetDeviceInfo(uint32_t deviceNumber,
&_dsMonikerDevEnum, 0);
if (hr != NOERROR) {
RTC_LOG(LS_INFO) << "Failed to enumerate CLSID_SystemDeviceEnum, error 0x"
<< std::hex << hr << ". No webcam exist?";
<< rtc::ToHex(hr) << ". No webcam exist?";
return 0;
}

Expand Down Expand Up @@ -223,7 +222,7 @@ IBaseFilter* DeviceInfoDS::GetDeviceFilter(const char* deviceUniqueIdUTF8,
&_dsMonikerDevEnum, 0);
if (hr != NOERROR) {
RTC_LOG(LS_INFO) << "Failed to enumerate CLSID_SystemDeviceEnum, error 0x"
<< std::hex << hr << ". No webcam exist?";
<< rtc::ToHex(hr) << ". No webcam exist?";
return 0;
}
_dsMonikerDevEnum->Reset();
Expand Down
13 changes: 6 additions & 7 deletions modules/video_capture/windows/sink_filter_ds.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@

#include "modules/video_capture/windows/sink_filter_ds.h"

#include <ios> // std::hex

#include "modules/video_capture/windows/help_functions_ds.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/platform_thread.h"
#include "rtc_base/stringutils.h"

#include <dvdmedia.h> // VIDEOINFOHEADER2
#include <initguid.h>
Expand Down Expand Up @@ -148,7 +147,7 @@ CaptureInputPin::GetMediaType(IN int iPosition, OUT CMediaType* pmt) {
RTC_LOG(LS_INFO) << "GetMediaType position " << iPosition << ", width "
<< _requestedCapability.width << ", height "
<< _requestedCapability.height << ", biCompression 0x"
<< std::hex << pvi->bmiHeader.biCompression;
<< rtc::ToHex(pvi->bmiHeader.biCompression);
return NOERROR;
}

Expand Down Expand Up @@ -188,8 +187,8 @@ CaptureInputPin::CheckMediaType(IN const CMediaType* pMediaType) {

RTC_LOG(LS_INFO) << "CheckMediaType width:" << pvi->bmiHeader.biWidth
<< " height:" << pvi->bmiHeader.biHeight
<< " Compression:0x" << std::hex
<< pvi->bmiHeader.biCompression;
<< " Compression:0x"
<< rtc::ToHex(pvi->bmiHeader.biCompression);

if (*SubType == MEDIASUBTYPE_MJPG &&
pvi->bmiHeader.biCompression == MAKEFOURCC('M', 'J', 'P', 'G')) {
Expand Down Expand Up @@ -233,8 +232,8 @@ CaptureInputPin::CheckMediaType(IN const CMediaType* pMediaType) {

RTC_LOG(LS_INFO) << "CheckMediaType width:" << pvi->bmiHeader.biWidth
<< " height:" << pvi->bmiHeader.biHeight
<< " Compression:0x" << std::hex
<< pvi->bmiHeader.biCompression;
<< " Compression:0x"
<< rtc::ToHex(pvi->bmiHeader.biCompression);

_resultingCapability.width = pvi->bmiHeader.biWidth;

Expand Down
5 changes: 2 additions & 3 deletions p2p/base/p2ptransportchannel.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2119,9 +2119,8 @@ void P2PTransportChannel::OnConnectionDestroyed(Connection* connection) {
unpinged_connections_.erase(*iter);
connections_.erase(iter);

RTC_LOG(LS_INFO) << ToString() << ": Removed connection "
<< std::hex << connection << std::dec << " ("
<< connections_.size() << " remaining)";
RTC_LOG(LS_INFO) << ToString() << ": Removed connection " << connection
<< " (" << connections_.size() << " remaining)";

// If this is currently the selected connection, then we need to pick a new
// one. The call to SortConnectionsAndUpdateState will pick a new one. It
Expand Down
7 changes: 3 additions & 4 deletions rtc_base/unittest_main.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,10 @@ void TestInvalidParameterHandler(const wchar_t* expression,
const wchar_t* file,
unsigned int line,
uintptr_t pReserved) {
// In order to log `expression`, `function`, and `file` here, we would have
// to convert them to const char*. std::wcsrtombs can do that, but it's
// locale dependent.
RTC_LOG(LS_ERROR) << "InvalidParameter Handler called. Exiting.";
RTC_LOG(LS_ERROR) << expression << std::endl
<< function << std::endl
<< file << std::endl
<< line;
exit(1);
}
void TestPureCallHandler() {
Expand Down

0 comments on commit 4343273

Please sign in to comment.