Revert "libvpx: Pull from upstream"

source/libvpx/test/video_source.h

 /*
  *  Copyright (c) 2012 The WebM 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.
  */
 #ifndef TEST_VIDEO_SOURCE_H_
@@ skipping 116 matching lines @@
   // Get the current frame counter, starting at 0.
   virtual unsigned int frame() const = 0;
 
   // Get the current file limit.
   virtual unsigned int limit() const = 0;
 };
 
 
 class DummyVideoSource : public VideoSource {
  public:
-  DummyVideoSource()
-      : img_(NULL),
-        limit_(100),
-        width_(80),
-        height_(64),
-        format_(VPX_IMG_FMT_I420) {
-    ReallocImage();
+  DummyVideoSource() : img_(NULL), limit_(100), width_(0), height_(0) {
+    SetSize(80, 64);
   }
 
   virtual ~DummyVideoSource() { vpx_img_free(img_); }
 
   virtual void Begin() {
     frame_ = 0;
     FillFrame();
   }
 
   virtual void Next() {
@@ skipping 18 matching lines @@
   virtual unsigned int frame() const { return frame_; }
 
   virtual unsigned int limit() const { return limit_; }
 
   void set_limit(unsigned int limit) {
     limit_ = limit;
   }
 
   void SetSize(unsigned int width, unsigned int height) {
     if (width != width_ || height != height_) {
+      vpx_img_free(img_);
+      img_ = vpx_img_alloc(NULL, VPX_IMG_FMT_I420, width, height, 32);
+      raw_sz_ = ((img_->w + 31) & ~31) * img_->h * 3 / 2;
       width_ = width;
       height_ = height;
-      ReallocImage();
-    }
-  }
-
-  void SetImageFormat(vpx_img_fmt_t format) {
-    if (format_ != format) {
-      format_ = format;
-      ReallocImage();
     }
   }
 
  protected:
   virtual void FillFrame() { if (img_) memset(img_->img_data, 0, raw_sz_); }
 
-  void ReallocImage() {
-    vpx_img_free(img_);
-    img_ = vpx_img_alloc(NULL, format_, width_, height_, 32);
-    raw_sz_ = ((img_->w + 31) & ~31) * img_->h * img_->bps / 8;
-  }
-
   vpx_image_t *img_;
   size_t       raw_sz_;
   unsigned int limit_;
   unsigned int frame_;
   unsigned int width_;
   unsigned int height_;
-  vpx_img_fmt_t format_;
 };
 
 
 class RandomVideoSource : public DummyVideoSource {
  public:
   RandomVideoSource(int seed = ACMRandom::DeterministicSeed())
       : rnd_(seed),
         seed_(seed) { }
 
  protected:
@@ skipping 37 matching lines @@
   virtual const uint8_t *cxdata() const = 0;
 
   virtual size_t frame_size() const = 0;
 
   virtual unsigned int frame_number() const = 0;
 };
 
 }  // namespace libvpx_test
 
 #endif  // TEST_VIDEO_SOURCE_H_