Work on flexible mode and screen sharing.

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

Index: webrtc/modules/video_coding/main/source/decoding_state_unittest.cc
diff --git a/webrtc/modules/video_coding/main/source/decoding_state_unittest.cc b/webrtc/modules/video_coding/main/source/decoding_state_unittest.cc
index feae701a65a72e7c80c4ef0766282490bdddb9ab..4238f4082f110bf4c1f68d593a72c6026b79e0a0 100644
--- a/webrtc/modules/video_coding/main/source/decoding_state_unittest.cc
+++ b/webrtc/modules/video_coding/main/source/decoding_state_unittest.cc
@@ -446,4 +446,138 @@ TEST(TestDecodingState, PictureIdRepeat) {
   EXPECT_FALSE(dec_state.ContinuousFrame(&frame));
 }
 
+TEST(TestDecodingState, FrameContinuityFlexibleMode) {
+  VCMDecodingState dec_state;
+  VCMFrameBuffer frame;
+  VCMPacket packet;
+  packet.isFirstPacket = true;
+  packet.timestamp = 1;
+  packet.seqNum = 0xffff;
+  uint8_t data[] = "I need a data pointer for this test!";
+  packet.sizeBytes = sizeof(data);
+  packet.dataPtr = data;
+  packet.codecSpecificHeader.codec = kRtpVideoVp9;
+
+  RTPVideoHeaderVP9& Vp9Hdr = packet.codecSpecificHeader.codecHeader.VP9;

[åsapersson, 2015/11/06 10:19:34]

nit: vp9_hdr 

[philipel1, 2015/11/06 14:35:16]

Done.

+  Vp9Hdr.picture_id = 10;
+  Vp9Hdr.flexible_mode = true;
+
+  FrameData frame_data;
+  frame_data.rtt_ms = 0;
+  frame_data.rolling_average_packets_per_frame = -1;
+
+  // Key frame as first frame
+  packet.frameType = kVideoFrameKey;
+  EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
+  EXPECT_TRUE(dec_state.ContinuousFrame(&frame));
+
+  // Delta frame as first frame
+  frame.Reset();
+  packet.frameType = kVideoFrameDelta;
+  EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
+  EXPECT_FALSE(dec_state.ContinuousFrame(&frame));
+
+  // Key frame then delta frame
+  frame.Reset();
+  packet.frameType = kVideoFrameKey;
+  EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
+  dec_state.SetState(&frame);
+  frame.Reset();
+  packet.frameType = kVideoFrameDelta;
+  Vp9Hdr.num_ref_pics = 1;
+  Vp9Hdr.picture_id = 15;
+  Vp9Hdr.pid_diff[0] = 5;
+  EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
+  EXPECT_TRUE(dec_state.ContinuousFrame(&frame));
+  dec_state.SetState(&frame);
+
+  // Ref to 11, not continuous
+  frame.Reset();
+  Vp9Hdr.picture_id = 16;
+  EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
+  EXPECT_FALSE(dec_state.ContinuousFrame(&frame));
+
+  // Ref to 15, continuous
+  frame.Reset();
+  Vp9Hdr.picture_id = 16;
+  Vp9Hdr.pid_diff[0] = 1;
+  EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
+  EXPECT_TRUE(dec_state.ContinuousFrame(&frame));
+  dec_state.SetState(&frame);
+
+  // Ref to 11 and 15, not continuous
+  frame.Reset();
+  Vp9Hdr.picture_id = 20;
+  Vp9Hdr.num_ref_pics = 2;
+  Vp9Hdr.pid_diff[0] = 9;
+  Vp9Hdr.pid_diff[1] = 5;
+  EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
+  EXPECT_FALSE(dec_state.ContinuousFrame(&frame));
+
+  // Ref to 10, 15 and 16, continuous
+  frame.Reset();
+  Vp9Hdr.picture_id = 22;
+  Vp9Hdr.num_ref_pics = 3;
+  Vp9Hdr.pid_diff[0] = 12;
+  Vp9Hdr.pid_diff[1] = 7;
+  Vp9Hdr.pid_diff[2] = 6;
+  EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
+  EXPECT_TRUE(dec_state.ContinuousFrame(&frame));
+  dec_state.SetState(&frame);
+
+  // Frame at last index, ref to 10, continuous
+  frame.Reset();
+  Vp9Hdr.picture_id = VCMDecodingState::kFrameDecodedLength - 1;
+  Vp9Hdr.num_ref_pics = 1;
+  Vp9Hdr.pid_diff[0] = VCMDecodingState::kFrameDecodedLength - 11;
+  EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
+  EXPECT_TRUE(dec_state.ContinuousFrame(&frame));
+  dec_state.SetState(&frame);
+
+  // Frame after wrapping buffer length, ref to 10 and last index, continuous
+  frame.Reset();
+  Vp9Hdr.picture_id = 0;
+  Vp9Hdr.num_ref_pics = 2;
+  Vp9Hdr.pid_diff[0] = 1;
+  Vp9Hdr.pid_diff[1] = VCMDecodingState::kFrameDecodedLength - 10;
+  EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
+  EXPECT_TRUE(dec_state.ContinuousFrame(&frame));
+  dec_state.SetState(&frame);
+
+  // Frame after wrapping start frame, ref to 0, continuous

[åsapersson, 2015/11/06 10:19:34]

Would this work if for example pid_diff was 10. Would be continuous but refer to
old pid:10 frame?

[philipel1, 2015/11/06 14:35:16]

Yes, that would incorrectly report the frame as continuous. Fixed now.

+  frame.Reset();
+  Vp9Hdr.picture_id = 20;
+  Vp9Hdr.num_ref_pics = 1;
+  Vp9Hdr.pid_diff[0] = 20;
+  EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
+  EXPECT_TRUE(dec_state.ContinuousFrame(&frame));
+  dec_state.SetState(&frame);
+
+  // Frame after wrapping start frame, ref to 10, not continuous
+  frame.Reset();
+  Vp9Hdr.picture_id = 23;
+  Vp9Hdr.num_ref_pics = 1;
+  Vp9Hdr.pid_diff[0] = 13;
+  EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
+  EXPECT_FALSE(dec_state.ContinuousFrame(&frame));
+
+  // Key frame, continuous
+  frame.Reset();
+  packet.frameType = kVideoFrameKey;
+  Vp9Hdr.picture_id = 25;
+  Vp9Hdr.num_ref_pics = 0;
+  EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
+  EXPECT_TRUE(dec_state.ContinuousFrame(&frame));
+  dec_state.SetState(&frame);
+
+  // Ref to frame previous to KF, not continuous
+  frame.Reset();
+  packet.frameType = kVideoFrameDelta;
+  Vp9Hdr.picture_id = 30;
+  Vp9Hdr.num_ref_pics = 1;
+  Vp9Hdr.pid_diff[0] = 30;
+  EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
+  EXPECT_FALSE(dec_state.ContinuousFrame(&frame));
+}
+
 }  // namespace webrtc