content/browser/renderer_host/media/video_capture_controller.cc - Issue 501033003: Remove implicit conversions from scoped_refptr to T* in content/browser/renderer_host/

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/browser/renderer_host/media/video_capture_controller.cc

Issue 501033003: Remove implicit conversions from scoped_refptr to T* in content/browser/renderer_host/ (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/browser/renderer_host/media/media_stream_manager.cc ('k') | content/browser/renderer_host/media/video_capture_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/video_capture_controller.cc

diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc

index 4fd53a88fb610b1262b25baee9e3761b6633fa56..fd5add47025d8d68db7f37c095626fe4e1993087 100644

--- a/content/browser/renderer_host/media/video_capture_controller.cc

+++ b/content/browser/renderer_host/media/video_capture_controller.cc

@@ -48,7 +48,7 @@ class PoolBuffer : public media::VideoCaptureDevice::Client::Buffer {

void* data,

size_t size)

: Buffer(buffer_id, data, size), pool_(pool) {

- DCHECK(pool_);

+ DCHECK(pool_.get());

}

private:

@@ -365,7 +365,7 @@ void VideoCaptureController::VideoCaptureDeviceClient::OnIncomingCapturedData(

scoped_refptr<Buffer> buffer =

DoReserveOutputBuffer(media::VideoFrame::I420, dimensions);

- if (!buffer)

+ if (!buffer.get())

return;

uint8* yplane = NULL;

bool flip = false;

@@ -464,7 +464,7 @@ void VideoCaptureController::VideoCaptureDeviceClient::OnIncomingCapturedData(

base::SharedMemory::NULLHandle(),

base::TimeDelta(),

base::Closure());

- DCHECK(frame);

+ DCHECK(frame.get());

VideoCaptureFormat format(

dimensions, frame_format.frame_rate, media::PIXEL_FORMAT_I420);