Revert of Delete remnants of non-square pixel support from cricket::VideoFrame.

talk/media/base/videoframe.h

 /*
  * libjingle
  * Copyright 2004 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 23 matching lines @@
 #include "webrtc/common_video/rotation.h"
 
 namespace cricket {
 
 // Represents a YUV420 (a.k.a. I420) video frame.
 class VideoFrame {
  public:
   VideoFrame() {}
   virtual ~VideoFrame() {}
 
-  virtual bool InitToBlack(int w, int h, int64_t time_stamp) = 0;
+  virtual bool InitToBlack(int w, int h, size_t pixel_width,
+                           size_t pixel_height, int64_t time_stamp) = 0;
   // Creates a frame from a raw sample with FourCC |format| and size |w| x |h|.
   // |h| can be negative indicating a vertically flipped image.
   // |dw| is destination width; can be less than |w| if cropping is desired.
   // |dh| is destination height, like |dw|, but must be a positive number.
   // Returns whether the function succeeded or failed.
 
   virtual bool Reset(uint32_t fourcc,
                      int w,
                      int h,
                      int dw,
                      int dh,
                      uint8_t* sample,
                      size_t sample_size,
+                     size_t pixel_width,
+                     size_t pixel_height,
                      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;
 
   size_t GetChromaWidth() const { return (GetWidth() + 1) / 2; }
@@ skipping 14 matching lines @@
   // Returns 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.
   virtual void* GetNativeHandle() const = 0;
 
   // Returns the underlying video frame buffer. This function is ok to call
   // multiple times, but the returned object will refer to the same memory.
   virtual rtc::scoped_refptr<webrtc::VideoFrameBuffer> GetVideoFrameBuffer()
       const = 0;
 
+  // For retrieving the aspect ratio of each pixel. Usually this is 1x1, but
+  // the aspect_ratio_idc parameter of H.264 can specify non-square pixels.
+  virtual size_t GetPixelWidth() const = 0;
+  virtual size_t GetPixelHeight() const = 0;
+
   virtual int64_t GetTimeStamp() const = 0;
   virtual void SetTimeStamp(int64_t time_stamp) = 0;
 
   // Indicates the rotation angle in degrees.
   // TODO(guoweis): Remove this function, rename GetVideoRotation and remove the
   // skeleton implementation of GetRotation once chrome is updated.
   virtual int GetRotation() const { return GetVideoRotation(); }
   virtual webrtc::VideoRotation GetVideoRotation() const {
     return webrtc::kVideoRotation_0;
   }
@@ skipping 92 matching lines @@
                        const uint8_t* sample,
                        size_t sample_size);
 
   // Size of an I420 image of given dimensions when stored as a frame buffer.
   static size_t SizeOf(size_t w, size_t h) {
     return w * h + ((w + 1) / 2) * ((h + 1) / 2) * 2;
   }
 
  protected:
   // Creates an empty frame.
-  virtual VideoFrame *CreateEmptyFrame(int w, int h,
+  virtual VideoFrame *CreateEmptyFrame(int w, int h, size_t pixel_width,
+                                       size_t pixel_height,
                                        int64_t time_stamp) const = 0;
   virtual void SetRotation(webrtc::VideoRotation rotation) = 0;
 };
 
 }  // namespace cricket
 
 #endif  // TALK_MEDIA_BASE_VIDEOFRAME_H_