Merge 23255 - Implemented endofstream callback for media::PipelineImpl....

webkit/glue/webmediaplayer_impl.cc

 // Copyright (c) 2008-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.
 
 #include "webkit/glue/webmediaplayer_impl.h"
 
 #include "base/command_line.h"
 #include "googleurl/src/gurl.h"
 #include "media/base/media_format.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
@@ skipping 75 matching lines @@
 void WebMediaPlayerImpl::Proxy::PipelineInitializationCallback() {
   render_loop_->PostTask(FROM_HERE, NewRunnableMethod(this,
       &WebMediaPlayerImpl::Proxy::PipelineInitializationTask));
 }
 
 void WebMediaPlayerImpl::Proxy::PipelineSeekCallback() {
   render_loop_->PostTask(FROM_HERE, NewRunnableMethod(this,
       &WebMediaPlayerImpl::Proxy::PipelineSeekTask));
 }
 
+void WebMediaPlayerImpl::Proxy::PipelineEndedCallback() {
+  render_loop_->PostTask(FROM_HERE, NewRunnableMethod(this,
+      &WebMediaPlayerImpl::Proxy::PipelineEndedTask));
+}
+
 void WebMediaPlayerImpl::Proxy::PipelineErrorCallback() {
   render_loop_->PostTask(FROM_HERE, NewRunnableMethod(this,
       &WebMediaPlayerImpl::Proxy::PipelineErrorTask));
 }
 
 void WebMediaPlayerImpl::Proxy::RepaintTask() {
   DCHECK(MessageLoop::current() == render_loop_);
   {
     AutoLock auto_lock(lock_);
     --outstanding_repaints_;
@@ skipping 11 matching lines @@
   }
 }
 
 void WebMediaPlayerImpl::Proxy::PipelineSeekTask() {
   DCHECK(MessageLoop::current() == render_loop_);
   if (webmediaplayer_) {
     webmediaplayer_->OnPipelineSeek();
   }
 }
 
+void WebMediaPlayerImpl::Proxy::PipelineEndedTask() {
+  DCHECK(MessageLoop::current() == render_loop_);
+  if (webmediaplayer_) {
+    webmediaplayer_->OnPipelineEnded();
+  }
+}
+
 void WebMediaPlayerImpl::Proxy::PipelineErrorTask() {
   DCHECK(MessageLoop::current() == render_loop_);
   if (webmediaplayer_) {
     webmediaplayer_->OnPipelineError();
   }
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // WebMediaPlayerImpl implementation
 
@@ skipping 18 matching lines @@
   }
 
   pipeline_ = new media::PipelineImpl(pipeline_thread_.message_loop());
 
   // Also we want to be notified of |main_loop_| destruction.
   main_loop_->AddDestructionObserver(this);
 
   // Creates the proxy.
   proxy_ = new Proxy(main_loop_, this);
 
-  // Sets the pipeline's error reporting callback.
+  // Set our pipeline callbacks.
+  pipeline_->SetPipelineEndedCallback(NewCallback(proxy_.get(),
+      &WebMediaPlayerImpl::Proxy::PipelineEndedCallback));
   pipeline_->SetPipelineErrorCallback(NewCallback(proxy_.get(),
       &WebMediaPlayerImpl::Proxy::PipelineErrorCallback));
 
   // Add in the default filter factories.
   filter_factory_->AddFactory(media::FFmpegDemuxer::CreateFilterFactory());
   filter_factory_->AddFactory(media::FFmpegAudioDecoder::CreateFactory());
   filter_factory_->AddFactory(media::FFmpegVideoDecoder::CreateFactory());
   filter_factory_->AddFactory(media::NullAudioRenderer::CreateFilterFactory());
   filter_factory_->AddFactory(VideoRendererImpl::CreateFactory(proxy_));
 }
@@ skipping 46 matching lines @@
 }
 
 bool WebMediaPlayerImpl::supportsSave() const {
   DCHECK(MessageLoop::current() == main_loop_);
   return true;
 }
 
 void WebMediaPlayerImpl::seek(float seconds) {
   DCHECK(MessageLoop::current() == main_loop_);
 
+  // TODO(scherkus): WebKit fires a seek(0) at the very start, however pipeline
+  // already does a seek(0) internally.  Investigate whether doing two seek(0)
+  // at the start impacts startup latency.
+
   // Try to preserve as much accuracy as possible.
   float microseconds = seconds * base::Time::kMicrosecondsPerSecond;
-  if (seconds != 0)
   pipeline_->Seek(
       base::TimeDelta::FromMicroseconds(static_cast<int64>(microseconds)),
       NewCallback(proxy_.get(),
                   &WebMediaPlayerImpl::Proxy::PipelineSeekCallback));
 }
 
 void WebMediaPlayerImpl::setEndTime(float seconds) {
   DCHECK(MessageLoop::current() == main_loop_);
 
   // TODO(hclam): add method call when it has been implemented.
@@ skipping 169 matching lines @@
   }
 }
 
 void WebMediaPlayerImpl::OnPipelineSeek() {
   DCHECK(MessageLoop::current() == main_loop_);
   if (pipeline_->GetError() == media::PIPELINE_OK) {
     GetClient()->timeChanged();
   }
 }
 
+void WebMediaPlayerImpl::OnPipelineEnded() {
+  DCHECK(MessageLoop::current() == main_loop_);
+  if (pipeline_->GetError() == media::PIPELINE_OK) {
+    GetClient()->timeChanged();
+  }
+}
+
 void WebMediaPlayerImpl::OnPipelineError() {
   DCHECK(MessageLoop::current() == main_loop_);
   switch (pipeline_->GetError()) {
     case media::PIPELINE_OK:
     case media::PIPELINE_STOPPING:
       NOTREACHED() << "We shouldn't get called with these non-errors";
       break;
 
     case media::PIPELINE_ERROR_INITIALIZATION_FAILED:
     case media::PIPELINE_ERROR_REQUIRED_FILTER_MISSING:
@@ skipping 53 matching lines @@
   }
 }
 
 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
   DCHECK(MessageLoop::current() == main_loop_);
   DCHECK(client_);
   return client_;
 }
 
 }  // namespace webkit_glue