Merge WebRTC r18998 and r19018 to M60 branch

webrtc/modules/video_coding/rtp_frame_reference_finder.cc

Index: webrtc/modules/video_coding/rtp_frame_reference_finder.cc
diff --git a/webrtc/modules/video_coding/rtp_frame_reference_finder.cc b/webrtc/modules/video_coding/rtp_frame_reference_finder.cc
index 16f529feea8d30306f46967e8782cee10d4a5146..0eea6d003a7eaeeddb1eb22664547199865c224c 100644
--- a/webrtc/modules/video_coding/rtp_frame_reference_finder.cc
+++ b/webrtc/modules/video_coding/rtp_frame_reference_finder.cc
@@ -264,11 +264,10 @@ RtpFrameReferenceFinder::FrameDecision RtpFrameReferenceFinder::ManageFrameVp8(
   // Find if there has been a gap in fully received frames and save the picture
   // id of those frames in |not_yet_received_frames_|.
   if (AheadOf<uint16_t, kPicIdLength>(frame->picture_id, last_picture_id_)) {
-    last_picture_id_ = Add<kPicIdLength>(last_picture_id_, 1);
-    while (last_picture_id_ != frame->picture_id) {
-      not_yet_received_frames_.insert(last_picture_id_);
+    do {
       last_picture_id_ = Add<kPicIdLength>(last_picture_id_, 1);
-    }
+      not_yet_received_frames_.insert(last_picture_id_);
+    } while (last_picture_id_ != frame->picture_id);
   }
 
   // Clean up info for base layers that are too old.