ppapi/shared_impl/media_stream_buffer_manager.cc - Issue 150403006: [PPAPI][MediaStream] Support configure for video input.

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: ppapi/shared_impl/media_stream_buffer_manager.cc

Issue 150403006: [PPAPI][MediaStream] Support configure for video input. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update Created 6 years, 10 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

« ppapi/proxy/ppapi_param_traits.cc ('K') | « ppapi/proxy/ppapi_param_traits.cc ('k') | ppapi/shared_impl/media_stream_video_track_shared.h » ('j') | ppapi/shared_impl/media_stream_video_track_shared.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ppapi/shared_impl/media_stream_buffer_manager.cc

diff --git a/ppapi/shared_impl/media_stream_buffer_manager.cc b/ppapi/shared_impl/media_stream_buffer_manager.cc

index b0588d6df4832540677c8b52fba39ac57610a762..52134678db164ce6e0f518d8423c8e73936a6288 100644

--- a/ppapi/shared_impl/media_stream_buffer_manager.cc

+++ b/ppapi/shared_impl/media_stream_buffer_manager.cc

@@ -31,7 +31,6 @@ bool MediaStreamBufferManager::SetBuffers(

scoped_ptr<base::SharedMemory> shm,

bool enqueue_all_buffers) {

DCHECK(shm);

- DCHECK(!shm_);

DCHECK_GT(number_of_buffers, 0);

DCHECK_GT(buffer_size,

static_cast<int32_t>(sizeof(MediaStreamBuffer::Header)));

@@ -45,6 +44,8 @@ bool MediaStreamBufferManager::SetBuffers(

if (!shm_->Map(size))

return false;

+ buffer_queue_.clear();

+ buffers_.clear();

uint8_t* p = reinterpret_cast<uint8_t*>(shm_->memory());

for (int32_t i = 0; i < number_of_buffers; ++i) {

if (enqueue_all_buffers)