aboutsummaryrefslogtreecommitdiff
path: root/talk/media/base/videoframe.h
diff options
context:
space:
mode:
authormagjed <magjed@webrtc.org>2015-10-01 03:02:44 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-01 10:03:05 +0000
commitb09b660c53ff2c499d149e05e5c435f5057273fc (patch)
treeb651617bd3bf8fbf1ea691256b54839536c2f4e4 /talk/media/base/videoframe.h
parentdfc8f4ff8731390828884a0a91b99e51f2950275 (diff)
downloadwebrtc-b09b660c53ff2c499d149e05e5c435f5057273fc.tar.gz
Remove cricket::VideoFrame::Set/GetElapsedTime()
This CL is a baby step towards consolidating the timestamps in cricket::VideoFrame and webrtc::VideoFrame, so that we can unify the frame classes in the future. The elapsed time functionality is not really used. If a video sink wants to know the elapsed time since the first frame they can store the first timestamp themselves and calculate the time delta to later frames. This is already done in all video sinks that need the elapsed time. Having redundant timestamps in the frame classes is confusing and error prone. TBR=pthatcher@webrtc.org Review URL: https://codereview.webrtc.org/1324263004 Cr-Commit-Position: refs/heads/master@{#10131}
Diffstat (limited to 'talk/media/base/videoframe.h')
-rw-r--r--talk/media/base/videoframe.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/talk/media/base/videoframe.h b/talk/media/base/videoframe.h
index ac53ca201b..7199dccf6d 100644
--- a/talk/media/base/videoframe.h
+++ b/talk/media/base/videoframe.h
@@ -42,8 +42,7 @@ class VideoFrame {
virtual ~VideoFrame() {}
virtual bool InitToBlack(int w, int h, size_t pixel_width,
- size_t pixel_height, int64_t elapsed_time,
- int64_t time_stamp) = 0;
+ size_t pixel_height, int64_t time_stamp) = 0;
// Creates a frame from a raw sample with FourCC |format| and size |w| x |h|.
// |h| can be negative indicating a vertically flipped image.
// |dw| is destination width; can be less than |w| if cropping is desired.
@@ -59,7 +58,6 @@ class VideoFrame {
size_t sample_size,
size_t pixel_width,
size_t pixel_height,
- int64_t elapsed_time,
int64_t time_stamp,
webrtc::VideoRotation rotation,
bool apply_rotation) = 0;
@@ -74,11 +72,10 @@ class VideoFrame {
size_t sample_size,
size_t pixel_width,
size_t pixel_height,
- int64_t elapsed_time,
int64_t time_stamp,
int rotation) {
return Reset(fourcc, w, h, dw, dh, sample, sample_size, pixel_width,
- pixel_height, elapsed_time, time_stamp,
+ pixel_height, time_stamp,
static_cast<webrtc::VideoRotation>(rotation), true);
}
@@ -117,9 +114,7 @@ class VideoFrame {
virtual size_t GetPixelWidth() const = 0;
virtual size_t GetPixelHeight() const = 0;
- virtual int64_t GetElapsedTime() const = 0;
virtual int64_t GetTimeStamp() const = 0;
- virtual void SetElapsedTime(int64_t elapsed_time) = 0;
virtual void SetTimeStamp(int64_t time_stamp) = 0;
// Indicates the rotation angle in degrees.
@@ -218,7 +213,6 @@ class VideoFrame {
// Creates an empty frame.
virtual VideoFrame *CreateEmptyFrame(int w, int h, size_t pixel_width,
size_t pixel_height,
- int64_t elapsed_time,
int64_t time_stamp) const = 0;
virtual void SetRotation(webrtc::VideoRotation rotation) = 0;
};