Delete IsMutable and IsExclusive methods.

webrtc/media/base/videoframe.h

 /*
  *  Copyright (c) 2004 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 38 matching lines @@
   }
 
   // Indicates the rotation angle in degrees.
   virtual webrtc::VideoRotation rotation() const = 0;
 
   // 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.
   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.
   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.
   virtual size_t ConvertToRgbBuffer(uint32_t to_fourcc,
@@ skipping 16 matching lines @@
                                bool interpolate,
                                bool crop) const;
 
   // Writes the frame into the target VideoFrame, stretched to the size of that
   // frame. 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 target frame before stretching.
   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();
 
   // Tests if sample is valid.  Returns true if valid.
   static bool Validate(uint32_t fourcc,
                        int w,
                        int h,
                        const uint8_t* sample,
                        size_t sample_size);
 
  protected:
   // Writes the frame into the given planes, stretched to the given width and
   // height. 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 bool CopyToPlanes(uint8_t* dst_y,
                             uint8_t* dst_u,
                             uint8_t* dst_v,
                             int32_t dst_pitch_y,
                             int32_t dst_pitch_u,
                             int32_t dst_pitch_v) const;
 
   // Creates an empty frame.
   virtual VideoFrame* CreateEmptyFrame(int w,
                                        int h,
                                        int64_t timestamp_us) const = 0;
+
   virtual void set_rotation(webrtc::VideoRotation rotation) = 0;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_BASE_VIDEOFRAME_H_