Merged VideoSurface, VideoFrame and VideoFrameImpl in VideoFrame.

media/base/video_frame_impl.h

Index: media/base/video_frame_impl.h
diff --git a/media/base/video_frame_impl.h b/media/base/video_frame_impl.h
deleted file mode 100644
index cf660ea50ae389d1513eeb631f8e942b848b7c82..0000000000000000000000000000000000000000
--- a/media/base/video_frame_impl.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Simple class that implements the VideoFrame interface with memory allocated
-// on the system heap.  This class supports every format defined in the
-// VideoSurface::Format enum.  The implementation attempts to properly align
-// allocations for maximum system bus efficency.
-#ifndef MEDIA_BASE_VIDEO_FRAME_IMPL_H_
-#define MEDIA_BASE_VIDEO_FRAME_IMPL_H_
-
-#include "media/base/buffers.h"
-
-namespace media {
-
-class VideoFrameImpl : public VideoFrame {
- public:
-  static void CreateFrame(VideoSurface::Format format,
-                          size_t width,
-                          size_t height,
-                          base::TimeDelta timestamp,
-                          base::TimeDelta duration,
-                          scoped_refptr<VideoFrame>* frame_out);
-
-  // Creates a frame with format equals to VideoSurface::EMPTY, width, height
-  // timestamp and duration are all 0.
-  static void CreateEmptyFrame(scoped_refptr<VideoFrame>* frame_out);
-
-  // Allocates YV12 frame based on |width| and |height|, and sets its data to
-  // the YUV equivalent of RGB(0,0,0).
-  static void CreateBlackFrame(int width, int height,
-                               scoped_refptr<VideoFrame>* frame_out);
-
-  // Implementation of VideoFrame.
-  virtual bool Lock(VideoSurface* surface);
-  virtual void Unlock();
-  virtual bool IsEndOfStream() const;
-
- private:
-  // Clients must use the static CreateFrame() method to create a new frame.
-  VideoFrameImpl(VideoSurface::Format format,
-                 size_t video_width,
-                 size_t video_height);
-
-  virtual ~VideoFrameImpl();
-
-  bool AllocateRGB(size_t bytes_per_pixel);
-  bool AllocateYUV();
-
-  bool locked_;
-  VideoSurface surface_;
-
-  DISALLOW_COPY_AND_ASSIGN(VideoFrameImpl);
-};
-
-}  // namespace media
-
-#endif  // MEDIA_BASE_VIDEO_FRAME_IMPL_H_