Remove cricket::VideoFrame::Set/GetElapsedTime()

talk/media/webrtc/webrtcvideoframe.h

 /*
  * libjingle
  * Copyright 2011 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 25 matching lines @@
 #include "webrtc/common_video/interface/video_frame_buffer.h"
 
 namespace cricket {
 
 struct CapturedFrame;
 
 class WebRtcVideoFrame : public VideoFrame {
  public:
   WebRtcVideoFrame();
   WebRtcVideoFrame(const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer,
-                   int64_t elapsed_time_ns,
                    int64_t time_stamp_ns,
                    webrtc::VideoRotation rotation);
 
   // TODO(guoweis): Remove this when chrome code base is updated.
   WebRtcVideoFrame(const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer,
                    int64_t elapsed_time_ns,
                    int64_t time_stamp_ns);
 
   ~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 format,
             int w,
             int h,
             int dw,
             int dh,
             uint8* sample,
             size_t sample_size,
             size_t pixel_width,
             size_t pixel_height,
-            int64_t elapsed_time_ns,
             int64_t time_stamp_ns,
             webrtc::VideoRotation rotation);
 
   bool Init(const CapturedFrame* frame, int dw, int dh, bool apply_rotation);
 
   void InitToEmptyBuffer(int w, int h, size_t pixel_width, size_t pixel_height,
-                         int64_t elapsed_time_ns, int64_t time_stamp_ns);
+                         int64_t time_stamp_ns);
+
+  // TODO(magjed): Remove once Chromium is updated.
+  bool InitToBlack(int w, int h, size_t pixel_width, size_t pixel_height,
+                   int64_t elapsed_time_ns, int64_t time_stamp_ns);
 
   bool InitToBlack(int w, int h, size_t pixel_width, size_t pixel_height,
-                   int64_t elapsed_time_ns, int64_t time_stamp_ns);
+                   int64_t time_stamp_ns);
 
   // From base class VideoFrame.
   virtual bool Reset(uint32 format,
                      int w,
                      int h,
                      int dw,
                      int dh,
                      uint8* sample,
                      size_t sample_size,
                      size_t pixel_width,
                      size_t pixel_height,
-                     int64_t elapsed_time_ns,
                      int64_t time_stamp_ns,
                      webrtc::VideoRotation rotation,
                      bool apply_rotation);
 
   virtual size_t GetWidth() const;
   virtual size_t GetHeight() const;
   virtual const uint8* GetYPlane() const;
   virtual const uint8* GetUPlane() const;
   virtual const uint8* GetVPlane() const;
   virtual uint8* GetYPlane();
   virtual uint8* GetUPlane();
   virtual uint8* GetVPlane();
   virtual int32 GetYPitch() const;
   virtual int32 GetUPitch() const;
   virtual int32 GetVPitch() const;
   virtual void* GetNativeHandle() const;
   virtual rtc::scoped_refptr<webrtc::VideoFrameBuffer> GetVideoFrameBuffer()
       const;
 
   virtual size_t GetPixelWidth() const { return pixel_width_; }
   virtual size_t GetPixelHeight() const { return pixel_height_; }
-  virtual int64_t GetElapsedTime() const { return elapsed_time_ns_; }
   virtual int64_t GetTimeStamp() const { return time_stamp_ns_; }
-  virtual void SetElapsedTime(int64_t elapsed_time_ns) {
-    elapsed_time_ns_ = elapsed_time_ns;
-  }
   virtual void SetTimeStamp(int64_t time_stamp_ns) {
     time_stamp_ns_ = time_stamp_ns;
   }
 
   virtual webrtc::VideoRotation GetVideoRotation() const { return rotation_; }
 
   virtual VideoFrame* Copy() const;
   virtual bool IsExclusive() const;
   virtual bool MakeExclusive();
   virtual size_t ConvertToRgbBuffer(uint32 to_fourcc, uint8* buffer,
                                     size_t size, int stride_rgb) const;
 
   const VideoFrame* GetCopyWithRotationApplied() const override;
 
  protected:
   void SetRotation(webrtc::VideoRotation rotation) override {
     rotation_ = rotation;
   }
 
  private:
   virtual VideoFrame* CreateEmptyFrame(int w, int h, size_t pixel_width,
                                        size_t pixel_height,
-                                       int64_t elapsed_time_ns,
                                        int64_t time_stamp_ns) const;
 
   // An opaque reference counted handle that stores the pixel data.
   rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer_;
   size_t pixel_width_;
   size_t pixel_height_;
-  int64_t elapsed_time_ns_;
   int64_t time_stamp_ns_;
   webrtc::VideoRotation rotation_;
 
   // This is mutable as the calculation is expensive but once calculated, it
   // remains const.
   mutable rtc::scoped_ptr<VideoFrame> rotated_frame_;
 };
 
 }  // namespace cricket
 
 #endif  // TALK_MEDIA_WEBRTCVIDEOFRAME_H_