Fix packetization logic to leave space for extensions in the last packet

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 e24cb41aac3ac07ce895cd33acaaaee45cbf7aca..c8790640f84e1223642caa31dcbe69ba3c74f6e8 100644
--- a/webrtc/video/video_send_stream_tests.cc
+++ b/webrtc/video/video_send_stream_tests.cc
@@ -263,6 +263,9 @@ TEST_F(VideoSendStreamTest, SupportsVideoRotation) {
     Action OnSendRtp(const uint8_t* packet, size_t length) override {
       RTPHeader header;
       EXPECT_TRUE(parser_->Parse(packet, length, &header));
+      // Wait for last packet of the frame.

[danilchap, 2017/05/12 13:56:11]

May be better to explain why wait for the last packet.

[ilnik, 2017/05/12 14:46:08]

Fixed. Now comment is more informative.

+      if (!header.markerBit)

[danilchap, 2017/05/12 13:56:11]

while normally early return is better, may be here it will more readable without
it, to stress VideoRotation should be checked only on packets with marker bit.
May be not, may be comment will be good enough.

[ilnik, 2017/05/12 14:46:08]

It can be on the packet with not marker bit (if it's the last packet of lower
spatial layer).

[danilchap, 2017/05/12 18:56:15]

It might be in any packet (like before your CL), but must be only in packets
with marker bit.
Comment looks good (may be just add 'the' before extension)

[ilnik, 2017/05/15 09:38:33]

Done.

+        return SEND_PACKET;
       EXPECT_TRUE(header.extension.hasVideoRotation);
       EXPECT_EQ(kVideoRotation_90, header.extension.videoRotation);
       observation_complete_.Set();
@@ -302,6 +305,9 @@ TEST_F(VideoSendStreamTest, SupportsVideoContentType) {
     Action OnSendRtp(const uint8_t* packet, size_t length) override {
       RTPHeader header;
       EXPECT_TRUE(parser_->Parse(packet, length, &header));
+      // Wait for last packet of the frame.
+      if (!header.markerBit)
+        return SEND_PACKET;
       EXPECT_TRUE(header.extension.hasVideoContentType);
       EXPECT_EQ(VideoContentType::SCREENSHARE,
                 header.extension.videoContentType);