Unwrap picture ids in the RtpFrameReferencerFinder.

webrtc/modules/video_coding/rtp_frame_reference_finder.h

Index: webrtc/modules/video_coding/rtp_frame_reference_finder.h
diff --git a/webrtc/modules/video_coding/rtp_frame_reference_finder.h b/webrtc/modules/video_coding/rtp_frame_reference_finder.h
index 74db45a2b8036a4d03ac846bcfa23686b2c14747..7bbd5e76d4155ed16cfbdbaf51ed72c2890f83d7 100644
--- a/webrtc/modules/video_coding/rtp_frame_reference_finder.h
+++ b/webrtc/modules/video_coding/rtp_frame_reference_finder.h
@@ -125,8 +125,6 @@ class RtpFrameReferenceFinder {
 
   // Unwrap |frame|s picture id and its references to 16 bits.
   void UnwrapPictureIds(RtpFrameObject* frame) EXCLUSIVE_LOCKS_REQUIRED(crit_);
-  // All picture ids are unwrapped to 16 bits.
-  uint16_t UnwrapPictureId(uint16_t picture_id) EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
   // Returns true if the frame is old and should be dropped.
   // TODO(philipel): Remove when VP9 PID/TL0 does not jump mid-stream (should be
@@ -213,6 +211,9 @@ class RtpFrameReferenceFinder {
   int cleared_to_seq_num_ GUARDED_BY(crit_);
 
   OnCompleteFrameCallback* frame_callback_;
+
+  SeqNumUnwrapper<uint16_t> generic_unwrapper_ GUARDED_BY(crit_);

[terelius, 2017/08/18 11:53:16]

It is not clear to me what should be unwrapped with unwrapper_ and what should
be unwrapped with generic_unwrapper_. Could the names be made more clear?

[philipel, 2017/08/24 10:46:10]

Added comments.

+  SeqNumUnwrapper<uint16_t, kPicIdLength> unwrapper_ GUARDED_BY(crit_);
 };
 
 }  // namespace video_coding