Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2608)

Unified Diff: content/renderer/pepper/pepper_media_stream_video_track_host.cc

Issue 2867693004: Snapshot of all changes to get jumbo in blink and content.
Patch Set: Exclude certain files from jumbo because of a Windows problem Created 3 years, 3 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
Index: content/renderer/pepper/pepper_media_stream_video_track_host.cc
diff --git a/content/renderer/pepper/pepper_media_stream_video_track_host.cc b/content/renderer/pepper/pepper_media_stream_video_track_host.cc
index 9e408dbd869f22f649c81d119603126788ec18a5..1566a830232549ab3f294367f62af4a90b05cad9 100644
--- a/content/renderer/pepper/pepper_media_stream_video_track_host.cc
+++ b/content/renderer/pepper/pepper_media_stream_video_track_host.cc
@@ -31,8 +31,8 @@ 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;
@@ -228,7 +228,7 @@ PepperMediaStreamVideoTrackHost::PepperMediaStreamVideoTrackHost(
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),
@@ -242,7 +242,7 @@ PepperMediaStreamVideoTrackHost::PepperMediaStreamVideoTrackHost(
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),
@@ -479,8 +479,8 @@ int32_t PepperMediaStreamVideoTrackHost::OnHostMsgConfigure(
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;
« no previous file with comments | « content/renderer/pepper/pepper_media_stream_audio_track_host.cc ('k') | content/renderer/pepper/pepper_video_encoder_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698