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

Unified Diff: talk/media/base/videoframe.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/base/videocapturer_unittest.cc ('k') | talk/media/base/videoframe.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/media/base/videoframe.h
diff --git a/talk/media/base/videoframe.h b/talk/media/base/videoframe.h
index ac53ca201ba2482aeff69ae3cd7b1d420cf7fdec..7199dccf6dda06a6b68e79d3094b263140f6aa10 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;
};
« no previous file with comments | « talk/media/base/videocapturer_unittest.cc ('k') | talk/media/base/videoframe.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698