Enabling spatial layers in VP9Impl. Filter layers in the loopback test.

webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc

 /*
  *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  *
  */
@@ skipping 194 matching lines @@
   }
   if (inst->width < 1 || inst->height < 1) {
     return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
   }
   if (number_of_cores < 1) {
     return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
   }
   if (inst->codecSpecific.VP9.numberOfTemporalLayers > 3) {
     return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
   }
-  // For now, only support one spatial layer.
-  if (inst->codecSpecific.VP9.numberOfSpatialLayers != 1) {
+  // libvpx currently supports only one or two spatial layers.
+  if (inst->codecSpecific.VP9.numberOfSpatialLayers > 2) {
     return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
   }
   int retVal = Release();
   if (retVal < 0) {
     return retVal;
   }
   if (encoder_ == NULL) {
     encoder_ = new vpx_codec_ctx_t;
   }
   if (config_ == NULL) {
@@ skipping 117 matching lines @@
     return 4;
   } else if (width * height >= 640 * 480 && number_of_cores > 2) {
     return 2;
   } else {
     // 1 thread less than VGA.
     return 1;
   }
 }
 
 int VP9EncoderImpl::InitAndSetControlSettings(const VideoCodec* inst) {
-
   config_->ss_number_layers = num_spatial_layers_;
 
   if (num_spatial_layers_ > 1) {

[mflodman, 2015/08/27 07:27:48]

I don't know the background for when to set min qp to 0 or 2, but should there
be an else setting 'rc_min_qualtizer' to 2 if 'num_spatial_layers_ == 1'?

I guess we can toggle the number of layers during a call, at least in theory.

[ivica, 2015/08/27 08:49:23]

I don't know why was it set to 0 here. I removed this 'if' completely for now.

     config_->rc_min_quantizer = 0;
-    config_->rc_max_quantizer = 63;
+    config_->rc_max_quantizer = 52;

[mflodman, 2015/08/27 07:27:48]

AFAICT this isn't needed, the max quantizer is already set to 52 and never
changed. Right?

[ivica, 2015/08/27 08:49:23]

I changed from 63 to 52, because 63 looks really bad. I removed this anyway now.

   }
   int scaling_factor_num = 256;
   for (int i = num_spatial_layers_ - 1; i >= 0; --i) {
     svc_internal_.svc_params.max_quantizers[i] = config_->rc_max_quantizer;
     svc_internal_.svc_params.min_quantizers[i] = config_->rc_min_quantizer;
     // 1:2 scaling in each dimension.
     svc_internal_.svc_params.scaling_factor_num[i] = scaling_factor_num;
     svc_internal_.svc_params.scaling_factor_den[i] = 256;
     scaling_factor_num /= 2;
   }
@@ skipping 27 matching lines @@
   // log2 unit: e.g., 0 = 1 tile column, 1 = 2 tile columns, 2 = 4 tile columns.
   // The number tile columns will be capped by the encoder based on image size
   // (minimum width of tile column is 256 pixels, maximum is 4096).
   vpx_codec_control(encoder_, VP9E_SET_TILE_COLUMNS, (config_->g_threads >> 1));
 #if !defined(WEBRTC_ARCH_ARM) && !defined(WEBRTC_ARCH_ARM64)
   // Note denoiser is still off by default until further testing/optimization,
   // i.e., codecSpecific.VP9.denoisingOn == 0.
   vpx_codec_control(encoder_, VP9E_SET_NOISE_SENSITIVITY,
                     inst->codecSpecific.VP9.denoisingOn ? 1 : 0);
 #endif
+  if (codec_.mode == kScreensharing) {
+    vpx_codec_control(encoder_, VP9E_SET_TUNE_CONTENT, 1);
+  }
+  vpx_codec_control(encoder_, VP8E_SET_STATIC_THRESHOLD, 1);
   inited_ = true;
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
 uint32_t VP9EncoderImpl::MaxIntraTarget(uint32_t optimal_buffer_size) {
   // Set max to the optimal buffer level (normalized by target BR),
   // and scaled by a scale_par.
   // Max target size = scale_par * optimal_buffer_size * targetBR[Kbps].
   // This value is presented in percentage of perFrameBw:
   // perFrameBw = targetBR[Kbps] * 1000 / framerate.
@@ skipping 116 matching lines @@
 
   vp9_info->picture_id = picture_id_;
 
   if (!vp9_info->flexible_mode) {
     if (layer_id.temporal_layer_id == 0 && layer_id.spatial_layer_id == 0) {
       tl0_pic_idx_++;
     }
     vp9_info->tl0_pic_idx = tl0_pic_idx_;
   }
 
+  // Always populate this, so that packetizer can properly set the marker bit.
+  vp9_info->num_spatial_layers = num_spatial_layers_;
   if (vp9_info->ss_data_available) {
-    vp9_info->num_spatial_layers = num_spatial_layers_;
     vp9_info->spatial_layer_resolution_present = true;
     for (size_t i = 0; i < vp9_info->num_spatial_layers; ++i) {
       vp9_info->width[i] = codec_.width *
                            svc_internal_.svc_params.scaling_factor_num[i] /
                            svc_internal_.svc_params.scaling_factor_den[i];
       vp9_info->height[i] = codec_.height *
                             svc_internal_.svc_params.scaling_factor_num[i] /
                             svc_internal_.svc_params.scaling_factor_den[i];
     }
     if (!vp9_info->flexible_mode) {
@@ skipping 220 matching lines @@
     decoder_ = NULL;
   }
   // Releases buffers from the pool. Any buffers not in use are deleted. Buffers
   // still referenced externally are deleted once fully released, not returning
   // to the pool.
   frame_buffer_pool_.ClearPool();
   inited_ = false;
   return WEBRTC_VIDEO_CODEC_OK;
 }
 }  // namespace webrtc