New helper function test::ReadI420Buffer, refactor FrameReader to use it.

webrtc/test/frame_utils.h

 /*
  *  Copyright (c) 2013 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.
  */
 #ifndef WEBRTC_TEST_FRAME_UTILS_H_
 #define WEBRTC_TEST_FRAME_UTILS_H_
 
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 
 namespace webrtc {
+class I420Buffer;
 class VideoFrame;
 class VideoFrameBuffer;
+
 namespace test {
 
 bool EqualPlane(const uint8_t* data1,
                 const uint8_t* data2,
                 int stride1,
                 int stride2,
                 int width,
                 int height);
 
 static inline bool EqualPlane(const uint8_t* data1,
                               const uint8_t* data2,
                               int stride,
                               int width,
                               int height) {
   return EqualPlane(data1, data2, stride, stride, width, height);
 }
 
 bool FramesEqual(const webrtc::VideoFrame& f1, const webrtc::VideoFrame& f2);
 
 bool FrameBufsEqual(const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& f1,
                     const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& f2);
 
+rtc::scoped_refptr<I420Buffer> ReadI420Buffer(int width, int height, FILE *);
+
 }  // namespace test
 }  // namespace webrtc
 
 #endif  // WEBRTC_TEST_FRAME_UTILS_H_