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

webrtc/modules/video_coding/main/source/generic_encoder.cc

 /*
  *  Copyright (c) 2012 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 37 matching lines @@
       rtp->codecHeader.VP9.picture_id = info->codecSpecific.VP9.picture_id;
       rtp->codecHeader.VP9.tl0_pic_idx = info->codecSpecific.VP9.tl0_pic_idx;
       rtp->codecHeader.VP9.temporal_idx = info->codecSpecific.VP9.temporal_idx;
       rtp->codecHeader.VP9.spatial_idx = info->codecSpecific.VP9.spatial_idx;
       rtp->codecHeader.VP9.temporal_up_switch =
           info->codecSpecific.VP9.temporal_up_switch;
       rtp->codecHeader.VP9.inter_layer_predicted =
           info->codecSpecific.VP9.inter_layer_predicted;
       rtp->codecHeader.VP9.gof_idx = info->codecSpecific.VP9.gof_idx;
 
+      // Packetizer needs to know the number of spatial layers to correctly set
+      // the marker bit, even when the number won't be written in the packet.
+      rtp->codecHeader.VP9.num_spatial_layers =
+          info->codecSpecific.VP9.num_spatial_layers;
       if (info->codecSpecific.VP9.ss_data_available) {
-        rtp->codecHeader.VP9.num_spatial_layers =
-            info->codecSpecific.VP9.num_spatial_layers;
         rtp->codecHeader.VP9.spatial_layer_resolution_present =
             info->codecSpecific.VP9.spatial_layer_resolution_present;
         if (info->codecSpecific.VP9.spatial_layer_resolution_present) {
           for (size_t i = 0; i < info->codecSpecific.VP9.num_spatial_layers;
                ++i) {
             rtp->codecHeader.VP9.width[i] = info->codecSpecific.VP9.width[i];
             rtp->codecHeader.VP9.height[i] = info->codecSpecific.VP9.height[i];
           }
         }
         rtp->codecHeader.VP9.gof.CopyGofInfoVP9(info->codecSpecific.VP9.gof);
@@ skipping 257 matching lines @@
 }
 
 void
 VCMEncodedFrameCallback::SetMediaOpt(
     media_optimization::MediaOptimization *mediaOpt)
 {
     _mediaOpt = mediaOpt;
 }
 
 }  // namespace webrtc