Fix timing frames and FEC conflict

webrtc/video/video_send_stream_tests.cc

Index: webrtc/video/video_send_stream_tests.cc
diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc
index db1ba4f49014308a01b223958bce9b62db6f52ed..d0c4fd0da9c7ad9d5a1633df32a1e4d0ef3f849b 100644
--- a/webrtc/video/video_send_stream_tests.cc
+++ b/webrtc/video/video_send_stream_tests.cc
@@ -348,9 +348,11 @@ TEST_F(VideoSendStreamTest, SupportsVideoTimingFrames) {
     Action OnSendRtp(const uint8_t* packet, size_t length) override {
       RTPHeader header;
       EXPECT_TRUE(parser_->Parse(packet, length, &header));
-      if (header.extension.has_video_timing) {
-        observation_complete_.Set();
-      }
+      // Only the last packet of the frame must have extension.
+      if (!header.markerBit)

[åsapersson, 2017/06/21 12:51:39]

check that extension is not set?

[ilnik, 2017/06/21 12:54:32]

Can't do, as extension may be set on not the last packet, if it's an end of a
lower spatial layer. Later, in tests, when LayerFilteringTransport truncates
higher spatial layers and puts marker bit in some packets, they should also
contain timing frame extension.

+        return SEND_PACKET;
+      EXPECT_TRUE(header.extension.has_video_timing);
+      observation_complete_.Set();
       return SEND_PACKET;
     }