Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1129)

Unified Diff: talk/media/webrtc/webrtcvideoframe.h

Issue 1324263004: Remove cricket::VideoFrame::Set/GetElapsedTime() (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased. Re-added CapturedFrame.elapsed_time. Remove once Chromium is updated. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2_unittest.cc ('k') | talk/media/webrtc/webrtcvideoframe.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/media/webrtc/webrtcvideoframe.h
diff --git a/talk/media/webrtc/webrtcvideoframe.h b/talk/media/webrtc/webrtcvideoframe.h
index 790047277dd34b82ca618fc9bf16285c1ce222e8..f173c969080af8da648db6ce7f335d26238e2e12 100644
--- a/talk/media/webrtc/webrtcvideoframe.h
+++ b/talk/media/webrtc/webrtcvideoframe.h
@@ -43,7 +43,6 @@ 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);
@@ -67,18 +66,21 @@ class WebRtcVideoFrame : public VideoFrame {
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 time_stamp_ns);
+
// From base class VideoFrame.
virtual bool Reset(uint32 format,
int w,
@@ -89,7 +91,6 @@ class WebRtcVideoFrame : public VideoFrame {
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);
@@ -111,11 +112,7 @@ class WebRtcVideoFrame : public VideoFrame {
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;
}
@@ -138,14 +135,12 @@ class WebRtcVideoFrame : public VideoFrame {
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_;
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2_unittest.cc ('k') | talk/media/webrtc/webrtcvideoframe.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698