Delete IsMutable and IsExclusive methods.

webrtc/media/base/videoframe.h

Index: webrtc/media/base/videoframe.h
diff --git a/webrtc/media/base/videoframe.h b/webrtc/media/base/videoframe.h
index 950f88848f6cbfb0191199dcea433a87d7fb37d6..d591e669344bdfac878671833b6bea481c782355 100644
--- a/webrtc/media/base/videoframe.h
+++ b/webrtc/media/base/videoframe.h
@@ -56,9 +56,13 @@ class VideoFrame {
   // frame buffer.
   virtual VideoFrame *Copy() const = 0;
 
-  // Since VideoFrame supports shallow copy and the internal frame buffer might
-  // be shared, this function can be used to check exclusive ownership.
-  virtual bool IsExclusive() const = 0;
+  // Create a new frame with a given buffer and meta data.
+  // TODO(nisse): Needed by VideoFactory. Must be deleted for merge of
+  // cricket::VideoFrame and webrtc::VideoFrame.
+  virtual VideoFrame* CreateWithBuffer(
+      const rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer,

[tommi, 2016/05/25 12:14:25]

const &?

[nisse-webrtc, 2016/05/25 12:38:02]

Done.

+      webrtc::VideoRotation rotation,
+      int64_t timestamp_us) const = 0;
 
   // Return a copy of frame which has its pending rotation applied. The
   // ownership of the returned frame is held by this frame.
@@ -95,12 +99,14 @@ class VideoFrame {
   virtual void StretchToFrame(VideoFrame *target, bool interpolate,
                               bool crop) const;
 
+#if 0

[tommi, 2016/05/25 12:14:25]

delete this method?

[nisse-webrtc, 2016/05/25 12:38:02]

Sorry for this left-over. It is no longer used, and now deleted.

   // Stretches the frame to the given size, creating a new VideoFrame object to
   // hold it. The parameter "interpolate" controls whether to interpolate or
   // just take the nearest-point. The parameter "crop" controls whether to crop
   // this frame to the aspect ratio of the given dimensions before stretching.
   virtual VideoFrame *Stretch(size_t w, size_t h, bool interpolate,
                               bool crop) const;
+#endif
 
   // Sets the video frame to black.
   virtual bool SetToBlack();
@@ -128,6 +134,7 @@ class VideoFrame {
   virtual VideoFrame* CreateEmptyFrame(int w,
                                        int h,
                                        int64_t timestamp_us) const = 0;
+
   virtual void set_rotation(webrtc::VideoRotation rotation) = 0;
 };