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

Side by Side Diff: talk/media/base/videocapturer.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, 2 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 unified diff | Download patch
« no previous file with comments | « talk/media/base/fakevideorenderer.h ('k') | talk/media/base/videocapturer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2010 Google Inc. 3 * Copyright 2010 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 webrtc::VideoRotation GetRotation() const; 83 webrtc::VideoRotation GetRotation() const;
84 84
85 // The width and height of the captured frame could be different from those 85 // The width and height of the captured frame could be different from those
86 // of VideoFormat. Once the first frame is captured, the width, height, 86 // of VideoFormat. Once the first frame is captured, the width, height,
87 // fourcc, pixel_width, and pixel_height should keep the same over frames. 87 // fourcc, pixel_width, and pixel_height should keep the same over frames.
88 int width; // in number of pixels 88 int width; // in number of pixels
89 int height; // in number of pixels 89 int height; // in number of pixels
90 uint32 fourcc; // compression 90 uint32 fourcc; // compression
91 uint32 pixel_width; // width of a pixel, default is 1 91 uint32 pixel_width; // width of a pixel, default is 1
92 uint32 pixel_height; // height of a pixel, default is 1 92 uint32 pixel_height; // height of a pixel, default is 1
93 int64 elapsed_time; // elapsed time since the creation of the frame 93 // TODO(magjed): |elapsed_time| is deprecated - remove once not used anymore.
94 // source (that is, the camera), in nanoseconds. 94 int64 elapsed_time;
95 int64 time_stamp; // timestamp of when the frame was captured, in unix 95 int64 time_stamp; // timestamp of when the frame was captured, in unix
96 // time with nanosecond units. 96 // time with nanosecond units.
97 uint32 data_size; // number of bytes of the frame data 97 uint32 data_size; // number of bytes of the frame data
98 98
99 // TODO(guoweis): This can't be converted to VideoRotation yet as it's 99 // TODO(guoweis): This can't be converted to VideoRotation yet as it's
100 // used by chrome now. 100 // used by chrome now.
101 int rotation; // rotation in degrees of the frame (0, 90, 180, 270) 101 int rotation; // rotation in degrees of the frame (0, 90, 180, 270)
102 102
103 void* data; // pointer to the frame data. This object allocates the 103 void* data; // pointer to the frame data. This object allocates the
104 // memory or points to an existing memory. 104 // memory or points to an existing memory.
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 396
397 // Whether capturer should apply rotation to the frame before signaling it. 397 // Whether capturer should apply rotation to the frame before signaling it.
398 bool apply_rotation_; 398 bool apply_rotation_;
399 399
400 RTC_DISALLOW_COPY_AND_ASSIGN(VideoCapturer); 400 RTC_DISALLOW_COPY_AND_ASSIGN(VideoCapturer);
401 }; 401 };
402 402
403 } // namespace cricket 403 } // namespace cricket
404 404
405 #endif // TALK_MEDIA_BASE_VIDEOCAPTURER_H_ 405 #endif // TALK_MEDIA_BASE_VIDEOCAPTURER_H_
OLDNEW
« no previous file with comments | « talk/media/base/fakevideorenderer.h ('k') | talk/media/base/videocapturer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698