Snapshot of all changes to get jumbo in blink and content.

content/renderer/pepper/pepper_media_stream_video_track_host.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/pepper/pepper_media_stream_video_track_host.h"
 
 #include <stddef.h>
 
 #include "base/base64.h"
 #include "base/logging.h"
@@ skipping 13 matching lines @@
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/media_stream_buffer.h"
 #include "third_party/libyuv/include/libyuv.h"
 
 using media::VideoFrame;
 using ppapi::host::HostMessageContext;
 using ppapi::MediaStreamVideoTrackShared;
 
 namespace {
 
-const int32_t kDefaultNumberOfBuffers = 4;
-const int32_t kMaxNumberOfBuffers = 8;
+const int32_t kVideoDefaultNumberOfBuffers = 4;
+const int32_t kVideoMaxNumberOfBuffers = 8;
 // Filter mode for scaling frames.
 const libyuv::FilterMode kFilterMode = libyuv::kFilterBox;
 
 const char kPepperVideoSourceName[] = "PepperVideoSourceName";
 
 // Default config for output mode.
 const int kDefaultOutputFrameRate = 30;
 
 media::VideoPixelFormat ToPixelFormat(PP_VideoFrame_Format format) {
   switch (format) {
@@ skipping 174 matching lines @@
   new_frame_callback_.Run(frame, base::TimeTicks());
 }
 
 PepperMediaStreamVideoTrackHost::PepperMediaStreamVideoTrackHost(
     RendererPpapiHost* host,
     PP_Instance instance,
     PP_Resource resource,
     const blink::WebMediaStreamTrack& track)
     : PepperMediaStreamTrackHostBase(host, instance, resource),
       track_(track),
-      number_of_buffers_(kDefaultNumberOfBuffers),
+      number_of_buffers_(kVideoDefaultNumberOfBuffers),
       source_frame_format_(PP_VIDEOFRAME_FORMAT_UNKNOWN),
       plugin_frame_format_(PP_VIDEOFRAME_FORMAT_UNKNOWN),
       frame_data_size_(0),
       type_(kRead),
       weak_factory_(this) {
   DCHECK(!track_.IsNull());
 }
 
 PepperMediaStreamVideoTrackHost::PepperMediaStreamVideoTrackHost(
     RendererPpapiHost* host,
     PP_Instance instance,
     PP_Resource resource)
     : PepperMediaStreamTrackHostBase(host, instance, resource),
-      number_of_buffers_(kDefaultNumberOfBuffers),
+      number_of_buffers_(kVideoDefaultNumberOfBuffers),
       source_frame_format_(PP_VIDEOFRAME_FORMAT_UNKNOWN),
       plugin_frame_format_(PP_VIDEOFRAME_FORMAT_UNKNOWN),
       frame_data_size_(0),
       type_(kWrite),
       weak_factory_(this) {
   InitBlinkTrack();
   DCHECK(!track_.IsNull());
 }
 
 PepperMediaStreamVideoTrackHost::~PepperMediaStreamVideoTrackHost() {
@@ skipping 216 matching lines @@
 
   bool changed = false;
   gfx::Size new_size(attributes.width, attributes.height);
   if (GetTargetSize(source_frame_size_, plugin_frame_size_) !=
       GetTargetSize(source_frame_size_, new_size)) {
     changed = true;
   }
   plugin_frame_size_ = new_size;
 
   int32_t buffers = attributes.buffers
-                        ? std::min(kMaxNumberOfBuffers, attributes.buffers)
-                        : kDefaultNumberOfBuffers;
+                        ? std::min(kVideoMaxNumberOfBuffers, attributes.buffers)
+                        : kVideoDefaultNumberOfBuffers;
   if (buffers != number_of_buffers_)
     changed = true;
   number_of_buffers_ = buffers;
 
   if (GetTargetFormat(source_frame_format_, plugin_frame_format_) !=
       GetTargetFormat(source_frame_format_, attributes.format)) {
     changed = true;
   }
   plugin_frame_format_ = attributes.format;
 
@@ skipping 34 matching lines @@
 }
 
 void PepperMediaStreamVideoTrackHost::OnTrackStarted(
     MediaStreamSource* source,
     MediaStreamRequestResult result,
     const blink::WebString& result_name) {
   DVLOG(3) << "OnTrackStarted result: " << result;
 }
 
 }  // namespace content