Merged VideoSurface, VideoFrame and VideoFrameImpl in VideoFrame.

media/filters/video_decoder_impl.h

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
 #ifndef MEDIA_FILTERS_VIDEO_DECODER_IMPL_H_
 #define MEDIA_FILTERS_VIDEO_DECODER_IMPL_H_
 
 #include "base/time.h"
 #include "media/base/pts_heap.h"
+#include "media/base/video_frame.h"
 #include "media/filters/decoder_base.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 // FFmpeg types.
 struct AVFrame;
 struct AVRational;
 
 namespace media {
 
 class VideoDecodeEngine;
@@ skipping 33 matching lines @@
     kFlushCodec,
     kDecodeFinished,
   };
 
   // Implement DecoderBase template methods.
   virtual void DoInitialize(DemuxerStream* demuxer_stream, bool* success,
                             Task* done_cb);
   virtual void DoSeek(base::TimeDelta time, Task* done_cb);
   virtual void DoDecode(Buffer* buffer, Task* done_cb);
 
-  virtual bool EnqueueVideoFrame(VideoSurface::Format surface_format,
+  virtual bool EnqueueVideoFrame(VideoFrame::Format surface_format,
                                  const TimeTuple& time,
                                  const AVFrame* frame);
 
   // Create an empty video frame and queue it.
   virtual void EnqueueEmptyFrame();
 
-  virtual void CopyPlane(size_t plane, const VideoSurface& surface,
+  virtual void CopyPlane(size_t plane, const VideoFrame& video_frame,
                          const AVFrame* frame);
 
   // Methods that pickup after the decode engine has finished its action.
   virtual void OnInitializeComplete(bool* success /* Not owned */,
                                     Task* done_cb);
   virtual void OnDecodeComplete(AVFrame* yuv_frame, bool* got_frame,
                                 Task* done_cb);
 
   // Attempt to get the PTS and Duration for this frame by examining the time
   // info provided via packet stream (stored in |pts_heap|), or the info
@@ skipping 24 matching lines @@
   scoped_ptr<AVRational> time_base_;  // Pointer to avoid needing full type.
   DecoderState state_;
   scoped_ptr<VideoDecodeEngine> decode_engine_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoDecoderImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_VIDEO_DECODER_IMPL_H_