Index: webrtc/media/base/videoframe.h |
diff --git a/webrtc/media/base/videoframe.h b/webrtc/media/base/videoframe.h |
index 4015f906f93c4ee0894d7a7167f4d62bf1b7b7bb..37d75da5d6b5588b93d6dbf1ef70a3fd1485a75b 100644 |
--- a/webrtc/media/base/videoframe.h |
+++ b/webrtc/media/base/videoframe.h |
@@ -19,6 +19,10 @@ |
namespace cricket { |
// Represents a YUV420 (a.k.a. I420) video frame. |
+ |
+// TODO(nisse): This class duplicates webrtc::VideoFrame. There's |
+// ongoing work to merge the classes. See |
+// https://bugs.chromium.org/p/webrtc/issues/detail?id=5682. |
class VideoFrame { |
public: |
VideoFrame() {} |
nisse-webrtc
2016/06/22 11:58:36
Why does it even have a constructor? It's an abstr
|
@@ -54,22 +58,32 @@ class VideoFrame { |
// Make a shallow copy of the frame. The frame buffer itself is not copied. |
// Both the current and new VideoFrame will share a single reference-counted |
// frame buffer. |
+ // TODO(nisse): Should be deleted in the cricket::VideoFrame and |
pbos-webrtc
2016/06/22 10:23:46
Mark more clearly that they're deprecated and expl
nisse-webrtc
2016/06/22 11:01:48
Problem is, that it's only clear that the methods
nisse-webrtc
2016/06/22 11:58:36
Done.
|
+ // webrtc::VideoFrame merge. |
virtual VideoFrame *Copy() const = 0; |
// Return a copy of frame which has its pending rotation applied. The |
// ownership of the returned frame is held by this frame. |
+ |
+ // TODO(nisse): Should be moved or deleted in the cricket::VideoFrame and |
+ // webrtc::VideoFrame merge. |
virtual const VideoFrame* GetCopyWithRotationApplied() const = 0; |
// Converts the I420 data to RGB of a certain type such as ARGB and ABGR. |
// Returns the frame's actual size, regardless of whether it was written or |
// not (like snprintf). Parameters size and stride_rgb are in units of bytes. |
// If there is insufficient space, nothing is written. |
+ // TODO(nisse): Should be moved or deleted in the cricket::VideoFrame and |
+ // webrtc::VideoFrame merge. |
virtual size_t ConvertToRgbBuffer(uint32_t to_fourcc, |
uint8_t* buffer, |
size_t size, |
int stride_rgb) const; |
- // Tests if sample is valid. Returns true if valid. |
+ // Tests if sample is valid. Returns true if valid. |
+ // TODO(nisse): Should be deleted in the cricket::VideoFrame and |
+ // webrtc::VideoFrame merge. Validation of sample_size possibly moved to |
+ // libyuv::ConvertToI420. |
static bool Validate(uint32_t fourcc, |
nisse-webrtc
2016/06/22 11:58:36
This method could probably be moved from public to
|
int w, |
int h, |