content/renderer/media/webrtc_audio_device_impl.cc - Issue 503683003: Remove implicit conversions from scoped_refptr to T* in content/renderer/media/webrtc*

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/media/webrtc_audio_device_impl.cc

Issue 503683003: Remove implicit conversions from scoped_refptr to T* in content/renderer/media/webrtc* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/renderer/media/webrtc_audio_capturer_unittest.cc ('k') | content/renderer/media/webrtc_audio_renderer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/webrtc_audio_device_impl.cc

diff --git a/content/renderer/media/webrtc_audio_device_impl.cc b/content/renderer/media/webrtc_audio_device_impl.cc

index 1339a6f4cb80161efb228271aaad2830eecec5ff..2e6eed649d5b7c4054565870da03792248bd45c0 100644

--- a/content/renderer/media/webrtc_audio_device_impl.cc

+++ b/content/renderer/media/webrtc_audio_device_impl.cc

@@ -202,7 +202,7 @@ void WebRtcAudioDeviceImpl::RenderData(media::AudioBus* audio_bus,

void WebRtcAudioDeviceImpl::RemoveAudioRenderer(WebRtcAudioRenderer* renderer) {

DCHECK(thread_checker_.CalledOnValidThread());

- DCHECK_EQ(renderer, renderer_);

+ DCHECK_EQ(renderer, renderer_.get());

base::AutoLock auto_lock(lock_);

// Notify the playout sink of the change.

for (PlayoutDataSinkList::const_iterator it = playout_sinks_.begin();

@@ -401,7 +401,7 @@ int32_t WebRtcAudioDeviceImpl::MinMicrophoneVolume(uint32_t* min_volume) const {

int32_t WebRtcAudioDeviceImpl::StereoPlayoutIsAvailable(bool* available) const {

DCHECK(initialized_);

- *available = renderer_ && renderer_->channels() == 2;

+ *available = renderer_.get() && renderer_->channels() == 2;

return 0;

}

@@ -444,7 +444,7 @@ int32_t WebRtcAudioDeviceImpl::RecordingSampleRate(

int32_t WebRtcAudioDeviceImpl::PlayoutSampleRate(

uint32_t* sample_rate) const {

- *sample_rate = renderer_ ? renderer_->sample_rate() : 0;

+ *sample_rate = renderer_.get() ? renderer_->sample_rate() : 0;

return 0;

}