Merged VideoSurface, VideoFrame and VideoFrameImpl in VideoFrame.

media/filters/video_renderer_base.cc

 // 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.
 
 #include "base/callback.h"
 #include "media/base/buffers.h"
 #include "media/base/filter_host.h"
-#include "media/base/video_frame_impl.h"
+#include "media/base/video_frame.h"
 #include "media/filters/video_renderer_base.h"
 
 namespace media {
 
 // Limit our read ahead to three frames.  One frame is typically in flux at all
 // times, as in frame n is discarded at the top of ThreadMain() while frame
 // (n + kMaxFrames) is being asynchronously fetched.  The remaining two frames
 // allow us to advance the current frame as well as read the timestamp of the
 // following frame for more accurate timing.
 //
@@ skipping 131 matching lines @@
   // TODO(scherkus): do we trust subclasses not to do something silly while
   // we're holding the lock?
   if (!OnInitialize(decoder)) {
     host()->SetError(PIPELINE_ERROR_INITIALIZATION_FAILED);
     callback->Run();
     return;
   }
 
   // Create a black frame so clients have something to render before we finish
   // prerolling.
-  VideoFrameImpl::CreateBlackFrame(width_, height_, &current_frame_);
+  VideoFrame::CreateBlackFrame(width_, height_, &current_frame_);
 
   // We're all good!  Consider ourselves paused (ThreadMain() should never
   // see us in the kUninitialized state).
   state_ = kPaused;
 
   // Create our video thread.
   if (!PlatformThread::Create(0, this, &thread_)) {
     NOTREACHED() << "Video thread creation failed";
     host()->SetError(PIPELINE_ERROR_INITIALIZATION_FAILED);
     callback->Run();
@@ skipping 144 matching lines @@
   frame_available_.Signal();
 
   // Check for our preroll complete condition.
   if (state_ == kSeeking) {
     DCHECK(seek_callback_.get());
     if (frames_.size() == kMaxFrames) {
       // We're paused, so make sure we update |current_frame_| to represent
       // our new location.
       state_ = kPaused;
       if (frames_.front()->IsEndOfStream()) {
-        VideoFrameImpl::CreateBlackFrame(width_, height_, &current_frame_);
+        VideoFrame::CreateBlackFrame(width_, height_, &current_frame_);
       } else {
         current_frame_ = frames_.front();
       }
 
       // Because we might remain paused (i.e., we were not playing before we
       // received a seek), we can't rely on ThreadMain() to notify the subclass
       // the frame has been updated.
       DCHECK(current_frame_);
       OnFrameAvailable();
 
@@ skipping 40 matching lines @@
     previous_time_ = now;
   }
 
   // Scale our sleep based on the playback rate.
   // TODO(scherkus): floating point badness and degrade gracefully.
   return base::TimeDelta::FromMicroseconds(
       static_cast<int64>(sleep.InMicroseconds() / playback_rate));
 }
 
 }  // namespace media