content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc - Issue 1064703002: VideoCaptureBufferPool: Refactor to allow support of non-ShMem backed buffers

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_buffer_pool_unittest.cc

Issue 1064703002: VideoCaptureBufferPool: Refactor to allow support of non-ShMem backed buffers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: miu@s nits Created 5 years, 8 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/video_capture_buffer_pool.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_buffer_pool_unittest.cc

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

index 39fd9857b3ee4da108bd71fedd1616bdc1fa975c..e8f446fc6cf33f897760d147e737527fb5afc5d6 100644

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

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

@@ -45,12 +45,11 @@ class VideoCaptureBufferPoolTest : public testing::Test {

}

scoped_ptr<Buffer> ReserveI420Buffer(const gfx::Size& dimensions) {

- const size_t frame_bytes =

- media::VideoFrame::AllocationSize(media::VideoFrame::I420, dimensions);

// To verify that ReserveI420Buffer always sets |buffer_id_to_drop|,

// initialize it to something different than the expected value.

int buffer_id_to_drop = ~expected_dropped_id_;

- int buffer_id = pool_->ReserveForProducer(frame_bytes, &buffer_id_to_drop);

+ int buffer_id = pool_->ReserveForProducer(media::PIXEL_FORMAT_I420,

+ dimensions, &buffer_id_to_drop);

if (buffer_id == VideoCaptureBufferPool::kInvalidId)

return scoped_ptr<Buffer>();