Chromium Code Reviews| Index: webrtc/media/engine/webrtcvideoframe.h |
| diff --git a/webrtc/media/engine/webrtcvideoframe.h b/webrtc/media/engine/webrtcvideoframe.h |
| index bdf5a02a62b8e70383804ff6dafa20e1b936ac67..dcae47a677c2dfcd2ff41549b1e52fb9995e6a7a 100644 |
| --- a/webrtc/media/engine/webrtcvideoframe.h |
| +++ b/webrtc/media/engine/webrtcvideoframe.h |
| @@ -22,8 +22,6 @@ |
| namespace cricket { |
| -struct CapturedFrame; |
| - |
| // TODO(nisse): This class will be deleted when the cricket::VideoFrame and |
| // webrtc::VideoFrame classes are merged. See |
| // https://bugs.chromium.org/p/webrtc/issues/detail?id=5682. Try to use only the |
| @@ -55,6 +53,10 @@ class WebRtcVideoFrame : public VideoFrame { |
| ~WebRtcVideoFrame(); |
| + // TODO(nisse): Init (and its helpers Reset and Validate) are used |
| + // only by the LoadFrame function used in the VideoFrame unittests. |
|
nisse-webrtc
2016/08/24 12:19:54
I'd like to note that as a follow on to this cl, w
|
| + // 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. |
| @@ -69,15 +71,6 @@ class WebRtcVideoFrame : public VideoFrame { |
| 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); |
| int width() const override; |