Fire CanPlayThrough immediately for local and streaming media files

webkit/media/webmediaplayer_impl.cc

 // Copyright (c) 2011 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/media/webmediaplayer_impl.h"
 
 #include <limits>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 273 matching lines @@
         media_stream_client_->GetVideoDecoder(url, message_loop_factory_.get());
     if (new_decoder.get()) {
       // Remove the default decoder.
       scoped_refptr<media::VideoDecoder> old_videodecoder;
       filter_collection_->SelectVideoDecoder(&old_videodecoder);
       filter_collection_->AddVideoDecoder(new_decoder.get());
       has_video = true;
     }
 
     // TODO(wjia): add audio decoder handling when it's available.
-    if (has_video || has_audio)
+    if (has_video || has_audio) {
+      // TODO(vrk/wjia): Setting true for local_source is under the assumption
+      // that the MediaStream represents a local webcam. This will need to
+      // change in the future when GetVideoDecoder is no longer hardcoded to
+      // only return CaptureVideoDecoders.
       filter_collection_->SetDemuxerFactory(
-          new media::DummyDemuxerFactory(has_video, has_audio));
+          new media::DummyDemuxerFactory(has_video, has_audio, true));
+    }
   }
 
   // Handle any volume changes that occured before load().
   setVolume(GetClient()->volume());
   // Get the preload value.
   setPreload(GetClient()->preload());
 
   // Initialize the pipeline.
   SetNetworkState(WebKit::WebMediaPlayer::Loading);
   SetReadyState(WebKit::WebMediaPlayer::HaveNothing);
@@ skipping 432 matching lines @@
     new_buffered[0].start = 0.0f;
     new_buffered[0].end =
         static_cast<float>(pipeline_->GetMediaDuration().InSecondsF());
     buffered_.swap(new_buffered);
 
     if (hasVideo()) {
       UMA_HISTOGRAM_BOOLEAN("Media.AcceleratedCompositingActive",
                             is_accelerated_compositing_active_);
     }
 
-    if (pipeline_->IsLoaded())
+    if (pipeline_->IsLocalSource())
       SetNetworkState(WebKit::WebMediaPlayer::Loaded);
 
     SetReadyState(WebKit::WebMediaPlayer::HaveMetadata);
-    // Fire canplaythrough immediately after playback begins because of
-    // crbug.com/105163.
-    // TODO(vrk): set ready state to HaveFutureData when bug above is fixed.
-    SetReadyState(WebKit::WebMediaPlayer::HaveEnoughData);
+    SetReadyState(WebKit::WebMediaPlayer::HaveFutureData);
   } else {
     // TODO(hclam): should use |status| to determine the state
     // properly and reports error using MediaError.
     // WebKit uses FormatError to indicate an error for bogus URL or bad file.
     // Since we are at the initialization stage we can safely treat every error
     // as format error. Should post a task to call to |webmediaplayer_|.
     SetNetworkState(WebKit::WebMediaPlayer::FormatError);
   }
 
   // Repaint to trigger UI update.
@@ skipping 68 matching lines @@
 void WebMediaPlayerImpl::OnNetworkEvent(NetworkEvent type) {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   switch(type) {
     case media::DOWNLOAD_CONTINUED:
       SetNetworkState(WebKit::WebMediaPlayer::Loading);
       break;
     case media::DOWNLOAD_PAUSED:
       SetNetworkState(WebKit::WebMediaPlayer::Idle);
       break;
     case media::CAN_PLAY_THROUGH:
-      // Temporarily disable delayed firing of CAN_PLAY_THROUGH due to
-      // crbug.com/105163.
-      // TODO(vrk): uncomment code below when bug above is fixed.
-      // SetReadyState(WebKit::WebMediaPlayer::HaveEnoughData);
+      SetReadyState(WebKit::WebMediaPlayer::HaveEnoughData);
       break;
     default:
       NOTREACHED();
   }
 }
 
 void WebMediaPlayerImpl::OnDemuxerOpened() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
 
   GetClient()->sourceOpened();
@@ skipping 55 matching lines @@
   return client_;
 }
 
 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   incremented_externally_allocated_memory_ = true;
   v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);
 }
 
 }  // namespace webkit_media