Reject XR TargetBitrate items with unsupported layer indices

webrtc/modules/rtp_rtcp/source/rtcp_receiver.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 719 matching lines @@
 
   uint32_t rtt_ntp = now - delay_rr - send_time;
   xr_rr_rtt_ms_ = CompactNtpRttToMs(rtt_ntp);
 }
 
 void RTCPReceiver::HandleXrTargetBitrate(
     const rtcp::TargetBitrate& target_bitrate,
     PacketInformation* packet_information) {
   BitrateAllocation bitrate_allocation;
   for (const auto& item : target_bitrate.GetTargetBitrates()) {
-    bitrate_allocation.SetBitrate(item.spatial_layer, item.temporal_layer,
-                                  item.target_bitrate_kbps * 1000);
+    if (item.spatial_layer >= kMaxSpatialLayers ||

[danilchap, 2016/12/06 13:12:56]

may be #include "webrtc/common_types.h" directly for
kMaxSpatialLayers/kMaxTemporalStreams.

[sprang_webrtc, 2016/12/06 13:22:41]

Done.

+        item.temporal_layer >= kMaxTemporalStreams) {
+      LOG(LS_WARNING)
+          << "Invalid layer in XR target bitrate pack: spatial index "
+          << item.spatial_layer << ", temporal index " << item.temporal_layer
+          << ", dropping.";
+    } else {
+      bitrate_allocation.SetBitrate(item.spatial_layer, item.temporal_layer,
+                                    item.target_bitrate_kbps * 1000);
+    }
   }
   packet_information->target_bitrate_allocation.emplace(bitrate_allocation);
 }
 
 void RTCPReceiver::HandlePLI(const CommonHeader& rtcp_block,
                              PacketInformation* packet_information) {
   rtcp::Pli pli;
   if (!pli.Parse(rtcp_block)) {
     ++num_skipped_packets_;
     return;
@@ skipping 323 matching lines @@
       } else {
         candidates.push_back(it->second.tmmbr_item);
         ++it;
       }
     }
   }
   return candidates;
 }
 
 }  // namespace webrtc