[PPAPI][MediaStream] Support configure for video input.

ppapi/shared_impl/media_stream_buffer_manager.cc

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..5d6b7ed3522c01efea9b99b38114086cc1c2c8f6 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)));

[jschuh, 2014/02/14 22:21:25]

I realize this is existing code, but shouldn't this be verified in release
builds, or are we checking it elsewhere?

[Peng, 2014/02/16 15:48:13]

Those input arguments are not from third party code (plugin). The caller will
make sure those arguments are valid. So we just use DCHECK() to check them in
debug build. Is it necessary to use CHECK() for release build as well?

@@ -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)
@@ -64,16 +65,16 @@ int32_t MediaStreamBufferManager::DequeueBuffer() {
 }
 
 void MediaStreamBufferManager::EnqueueBuffer(int32_t index) {
-  DCHECK_GE(index, 0);
-  DCHECK_LT(index, number_of_buffers_);
+  CHECK_GE(index, 0) << "Invalid buffer index";
+  CHECK_LT(index, number_of_buffers_) << "Invalid buffer index";
   buffer_queue_.push_back(index);
   delegate_->OnNewBufferEnqueued();
 }
 
 MediaStreamBuffer* MediaStreamBufferManager::GetBufferPointer(
     int32_t index) {
-  DCHECK_GE(index, 0);
-  DCHECK_LT(index, number_of_buffers_);
+  CHECK_GE(index, 0) << "Invalid buffer index";
+  CHECK_LT(index, number_of_buffers_) << "Invalid buffer index";
   return buffers_[index];
 }