Add cricket::VideoFrame::frame_id() and set it to RTP timestamp.

webrtc/media/engine/webrtcvideoframe.h

 /*
  *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 20 matching lines @@
 // class.
 class WebRtcVideoFrame : public VideoFrame {
  public:
   // TODO(nisse): Deprecated. Using the default constructor violates the
   // reasonable assumption that video_frame_buffer() returns a valid buffer.
   WebRtcVideoFrame();
 
   // Preferred constructor.
   WebRtcVideoFrame(const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer,
                    webrtc::VideoRotation rotation,
-                   int64_t timestamp_us);
+                   int64_t timestamp_us,
+                   uint32_t transport_frame_id);
 
   // TODO(nisse): Deprecated, delete as soon as all callers have switched to the
   // above constructor with microsecond timestamp.
   WebRtcVideoFrame(const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer,
-                   int64_t time_stamp_ns,
+                   int64_t timestamp_ns,
                    webrtc::VideoRotation rotation);
 
   ~WebRtcVideoFrame();
 
   // Creates a frame from a raw sample with FourCC "format" and size "w" x "h".
   // "h" can be negative indicating a vertically flipped image.
   // "dh" is destination height if cropping is desired and is always positive.
   // Returns "true" if successful.
   bool Init(uint32_t format,
             int w,
             int h,
             int dw,
             int dh,
             uint8_t* sample,
             size_t sample_size,
-            int64_t time_stamp_ns,
+            int64_t timestamp_ns,
             webrtc::VideoRotation rotation);
 
   // TODO(nisse): We're moving to have all timestamps use the same
   // time scale as rtc::TimeMicros. However, this method is used by
   // WebRtcVideoFrameFactory::CreateAliasedFrame this code path
   // currently does not conform to the new timestamp conventions and
   // may use the camera's own clock instead. It's unclear if this
   // should be fixed, or if instead all of the VideoFrameFactory
   // abstraction should be eliminated.
   bool Init(const CapturedFrame* frame, int dw, int dh, bool apply_rotation);
 
   void InitToEmptyBuffer(int w, int h);
 
   int width() const override;
   int height() const override;
 
   const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& video_frame_buffer()
       const override;
 
-  /* System monotonic clock */
-  int64_t timestamp_us() const override { return timestamp_us_; }
-  void set_timestamp_us(int64_t time_us) override { timestamp_us_ = time_us; };
+  uint32_t transport_frame_id() const override;
 
-  webrtc::VideoRotation rotation() const override { return rotation_; }
+  int64_t timestamp_us() const override;
+  void set_timestamp_us(int64_t time_us) override;
+
+  webrtc::VideoRotation rotation() const override;
 
   VideoFrame* Copy() const override;
 
   size_t ConvertToRgbBuffer(uint32_t to_fourcc,
                             uint8_t* buffer,
                             size_t size,
                             int stride_rgb) const override;
 
   const VideoFrame* GetCopyWithRotationApplied() const override;
 
@@ skipping 14 matching lines @@
              webrtc::VideoRotation rotation,
              bool apply_rotation);
 
  private:
   // Tests mutate |rotation_|, so the base test class is a friend.
   friend class WebRtcVideoFrameTest;
 
   // An opaque reference counted handle that stores the pixel data.
   rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer_;
   int64_t timestamp_us_;
+  uint32_t transport_frame_id_;
   webrtc::VideoRotation rotation_;
 
   // This is mutable as the calculation is expensive but once calculated, it
   // remains const.
   mutable std::unique_ptr<VideoFrame> rotated_frame_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_