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

Unified Diff: webrtc/video_frame.h

Issue 1881953002: Delete method webrtc::VideoFrame::native_handle. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Make EqualFramesVector and ExpectEqualFramesVector ignore timestamps. Created 4 years, 8 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
« webrtc/video/video_receive_stream.cc ('K') | « webrtc/video/vie_encoder.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video_frame.h
diff --git a/webrtc/video_frame.h b/webrtc/video_frame.h
index 28a6b8716d34eb57d0ed0aca4b58ba0c57cda7c1..deb7b92d39e9d63686a50c4236a3a07fa05e06b3 100644
--- a/webrtc/video_frame.h
+++ b/webrtc/video_frame.h
@@ -17,6 +17,12 @@
#include "webrtc/common_video/rotation.h"
#include "webrtc/typedefs.h"
+// TODO(nisse): Temporary hack while running the bots; we can't delete
+// the method for real just yet, since it's used in one place in
+// Chrome.
+
+#define ENABLE_WEBRTC_VIDEOFRAME_NATIVE_HANDLE 0
+
namespace webrtc {
class VideoFrame {
@@ -125,11 +131,15 @@ class VideoFrame {
// Return true if underlying plane buffers are of zero size, false if not.
bool IsZeroSize() const;
+#if ENABLE_WEBRTC_VIDEOFRAME_NATIVE_HANDLE
+ // TODO(nisse): Should be deleted, in favor of using the
+ // corresponding method on the underlying VideoFrameBuffer.
+
// Return the handle of the underlying video frame. This is used when the
// frame is backed by a texture. The object should be destroyed when it is no
// longer in use, so the underlying resource can be freed.
void* native_handle() const;
-
+#endif
// Return the underlying buffer.
rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer() const;
« webrtc/video/video_receive_stream.cc ('K') | « webrtc/video/vie_encoder.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698