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

Unified Diff: content/renderer/pepper/pepper_video_encoder_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_video_encoder_host.cc
diff --git a/content/renderer/pepper/pepper_video_encoder_host.cc b/content/renderer/pepper/pepper_video_encoder_host.cc
index a9c7fe1685573cd1c023dacf5d7e258c309900fc..33acbd7a34536ded42859fe2de72d6a73d21574e 100644
--- a/content/renderer/pepper/pepper_video_encoder_host.cc
+++ b/content/renderer/pepper/pepper_video_encoder_host.cc
@@ -164,7 +164,7 @@ PP_VideoProfileDescription PP_FromVideoEncodeAcceleratorSupportedProfile(
return pp_profile;
}
-bool PP_HardwareAccelerationCompatible(bool accelerated,
+bool PP_HardwareAccelerationCompatibleVideo(bool accelerated,
PP_HardwareAcceleration requested) {
switch (requested) {
case PP_HARDWAREACCELERATION_ONLY:
@@ -509,7 +509,7 @@ bool PepperVideoEncoderHost::IsInitializationValid(
if (output_profile == profile.profile &&
input_size.width <= profile.max_resolution.width &&
input_size.height <= profile.max_resolution.height &&
- PP_HardwareAccelerationCompatible(
+ PP_HardwareAccelerationCompatibleVideo(
profile.hardware_accelerated == PP_TRUE, acceleration))
return true;
}
« no previous file with comments | « content/renderer/pepper/pepper_media_stream_video_track_host.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698