Index: webrtc/media/engine/webrtcvideoframe.h |
diff --git a/webrtc/media/engine/webrtcvideoframe.h b/webrtc/media/engine/webrtcvideoframe.h |
index 79ad571236cfd922898989fd453f461daecc12db..d0034e27cd5efc43e1505ac277bbf3005f552403 100644 |
--- a/webrtc/media/engine/webrtcvideoframe.h |
+++ b/webrtc/media/engine/webrtcvideoframe.h |
@@ -21,6 +21,8 @@ |
#include "webrtc/media/base/videoframe.h" |
namespace cricket { |
+ |
+struct CapturedFrame; |
// TODO(nisse): This class will be deleted when the cricket::VideoFrame and |
// webrtc::VideoFrame classes are merged. See |
@@ -53,10 +55,6 @@ |
~WebRtcVideoFrame(); |
- // TODO(nisse): Init (and its helpers Reset and Validate) are used |
- // only by the LoadFrame function used in the VideoFrame unittests. |
- // Rewrite tests, and delete this function. |
- |
// 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. |
@@ -70,6 +68,15 @@ |
size_t sample_size, |
int64_t timestamp_ns, |
webrtc::VideoRotation rotation); |
+ |
+ // TODO(nisse): We're moving to have all timestamps use the same |
+ // time scale as rtc::TimeMicros. However, this method is used by |
+ // WebRtcVideoFrameFactory::CreateAliasedFrame this code path |
+ // currently does not conform to the new timestamp conventions and |
+ // may use the camera's own clock instead. It's unclear if this |
+ // should be fixed, or if instead all of the VideoFrameFactory |
+ // abstraction should be eliminated. |
+ bool Init(const CapturedFrame* frame, int dw, int dh, bool apply_rotation); |
void InitToEmptyBuffer(int w, int h); |