Switch VP9 lossy encode to CPUUSED=7 and use it by default.

remoting/codec/video_encoder_vpx.cc

 // Copyright 2013 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 "remoting/codec/video_encoder_vpx.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/sys_info.h"
@@ skipping 115 matching lines @@
     config.rc_max_quantizer = 0;
   } else {
     // Lossy encode using the same settings as for VP8.
     config.rc_min_quantizer = 20;
     config.rc_max_quantizer = 30;
   }
 
   if (vpx_codec_enc_init(codec.get(), algo, &config, 0))
     return ScopedVpxCodec();
 
-  // Request the lowest-CPU encode feature-set that VP9 supports.
+  // Request the lowest-CPU usage that VP9 supports, which depends on whether
+  // we are encoding lossy or lossless.
   // Note that this is configured via the same parameter as for VP8.
-  if (vpx_codec_control(codec.get(), VP8E_SET_CPUUSED, 5))
+  int cpu_used = lossless_encode ? 5 : 7;
+  if (vpx_codec_control(codec.get(), VP8E_SET_CPUUSED, cpu_used))
     return ScopedVpxCodec();
 
   // Use the lowest level of noise sensitivity so as to spend less time
   // on motion estimation and inter-prediction mode.
   // Note that this is configured via the same parameter as for VP8.
   if (vpx_codec_control(codec.get(), VP8E_SET_NOISE_SENSITIVITY, 0))
     return ScopedVpxCodec();
 
   return codec.Pass();
 }
@@ skipping 178 matching lines @@
   return packet.Pass();
 }
 
 VideoEncoderVpx::VideoEncoderVpx(bool use_vp9)
     : use_vp9_(use_vp9),
       lossless_encode_(false),
       lossless_color_(false),
       active_map_width_(0),
       active_map_height_(0) {
   if (use_vp9_) {
-    // Use lossless encoding mode by default.
-    SetLosslessEncode(true);
-
     // Use I444 colour space, by default, if specified on the command-line.
     if (CommandLine::ForCurrentProcess()->HasSwitch(kEnableI444SwitchName)) {
       SetLosslessColor(true);
     }
   }
 }
 
 bool VideoEncoderVpx::Initialize(const webrtc::DesktopSize& size) {
   DCHECK(use_vp9_ || !lossless_color_);
   DCHECK(use_vp9_ || !lossless_encode_);
@@ skipping 110 matching lines @@
     uint8* map = active_map_.get() + top * active_map_width_;
     for (int y = top; y <= bottom; ++y) {
       for (int x = left; x <= right; ++x)
         map[x] = 1;
       map += active_map_width_;
     }
   }
 }
 
 }  // namespace remoting