cricket::VideoFrame cleanup. New width() and height(). Deleted GetChroma* 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 27 matching lines @@
                      int dw,
                      int dh,
                      uint8_t* sample,
                      size_t sample_size,
                      int64_t time_stamp,
                      webrtc::VideoRotation rotation,
                      bool apply_rotation) = 0;
 
   // Basic accessors.
   // Note this is the width and height without rotation applied.
-  virtual size_t GetWidth() const = 0;
-  virtual size_t GetHeight() const = 0;
+  virtual int width() const = 0;
+  virtual int height() const = 0;
 
-  size_t GetChromaWidth() const { return (GetWidth() + 1) / 2; }
-  size_t GetChromaHeight() const { return (GetHeight() + 1) / 2; }
-  size_t GetChromaSize() const { return GetUPitch() * GetChromaHeight(); }
+  // Deprecated methods, for backwards compatibility.
+  // TODO(nisse): Delete when usage in Chrome and other applications
+  // have been replaced by width() and height().
+  virtual size_t GetWidth() const final { return width(); }
+  virtual size_t GetHeight() const final { return height(); }
+
   // These can return NULL if the object is not backed by a buffer.
   virtual const uint8_t* GetYPlane() const = 0;
   virtual const uint8_t* GetUPlane() const = 0;
   virtual const uint8_t* GetVPlane() const = 0;
   virtual uint8_t* GetYPlane() = 0;
   virtual uint8_t* GetUPlane() = 0;
   virtual uint8_t* GetVPlane() = 0;
 
   virtual int32_t GetYPitch() const = 0;
   virtual int32_t GetUPitch() const = 0;
@@ skipping 99 matching lines @@
 
   // Creates an empty frame.
   virtual VideoFrame *CreateEmptyFrame(int w, int h,
                                        int64_t time_stamp) const = 0;
   virtual void SetRotation(webrtc::VideoRotation rotation) = 0;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_BASE_VIDEOFRAME_H_