Enable probing with repeated payload packets by default.

webrtc/video/video_send_stream_tests.cc

 /*
  *  Copyright (c) 2013 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.
  */
 #include <algorithm>  // max
@@ skipping 521 matching lines @@
           return SEND_PACKET;
         }
       }
 
       accumulated_size_ += length;
 
       if (use_fec_)
         TriggerLossReport(header);
 
       if (test_generic_packetization_) {
-        size_t overhead = header.headerLength + header.paddingLength +
-                          (1 /* Generic header */);
-        if (use_fec_)
-          overhead += 1;  // RED for FEC header.
+        size_t overhead = header.headerLength + header.paddingLength;
+        // Only remove payload header and RED header if the packet actually
+        // contains payload.
+        if (length > overhead) {
+          overhead += (1 /* Generic header */);
+          if (use_fec_)
+            overhead += 1;  // RED for FEC header.
+        }
+        EXPECT_GE(length, overhead);
         accumulated_payload_ += length - overhead;
       }
 
       // Marker bit set indicates last packet of a frame.
       if (header.markerBit) {
         if (use_fec_ && accumulated_payload_ == current_size_rtp_ - 1) {
           // With FEC enabled, frame size is incremented asynchronously, so
           // "old" frames one byte too small may arrive. Accept, but don't
           // increase expected frame size.
           accumulated_size_ = 0;
@@ skipping 1280 matching lines @@
     RTPHeader header;
     EXPECT_TRUE(parser_->Parse(packet, length, &header));
 
     if (header.payloadType == kVp9PayloadType) {
       RtpDepacketizerVp9 vp9depacketizer;
       RtpDepacketizer::ParsedPayload vp9payload;
       const uint8_t* vp9_packet = packet + header.headerLength;
       size_t payload_length =
           length - header.headerLength - header.paddingLength;
 
-      bool parse_vp9header_successful =
-          vp9depacketizer.Parse(&vp9payload, vp9_packet, payload_length);
-      bool is_vp9_codec_type =
-          vp9payload.type.Video.codec == RtpVideoCodecTypes::kRtpVideoVp9;
-      EXPECT_TRUE(parse_vp9header_successful);
-      EXPECT_TRUE(is_vp9_codec_type);
+      if (payload_length > 0) {
+        bool parse_vp9header_successful =
+            vp9depacketizer.Parse(&vp9payload, vp9_packet, payload_length);
+        bool is_vp9_codec_type =
+            vp9payload.type.Video.codec == RtpVideoCodecTypes::kRtpVideoVp9;
+        EXPECT_TRUE(parse_vp9header_successful);
+        EXPECT_TRUE(is_vp9_codec_type);
 
-      RTPVideoHeaderVP9* vp9videoHeader =
-          &vp9payload.type.Video.codecHeader.VP9;
-      if (parse_vp9header_successful && is_vp9_codec_type) {
-        InspectHeader(vp9videoHeader);
-      } else {
-        observation_complete_->Set();
+        RTPVideoHeaderVP9* vp9videoHeader =
+            &vp9payload.type.Video.codecHeader.VP9;
+        if (parse_vp9header_successful && is_vp9_codec_type) {
+          InspectHeader(vp9videoHeader);
+        } else {
+          observation_complete_->Set();
+        }
       }
     }
 
     return SEND_PACKET;
   }
 
  protected:
   rtc::scoped_ptr<VP9Encoder> vp9_encoder_;
   VideoCodecVP9 vp9_settings_;
 };
@@ skipping 22 matching lines @@
       EXPECT_TRUE(vp9videoHeader->flexible_mode);
       observation_complete_->Set();
     }
 
   } test;
 
   RunBaseTest(&test);
 }
 
 }  // namespace webrtc