Adding flag for turning on the Media Source API

webkit/glue/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/glue/webmediaplayer_impl.h"
 
 #include <limits>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 174 matching lines @@
       new media::CompositeDataSourceFactory());
 
   if (use_simple_data_source) {
     data_source_factory->AddFactory(simple_data_source_factory.release());
     data_source_factory->AddFactory(buffered_data_source_factory.release());
   } else {
     data_source_factory->AddFactory(buffered_data_source_factory.release());
     data_source_factory->AddFactory(simple_data_source_factory.release());
   }
 
-  filter_collection_->SetDemuxerFactory(new media::FFmpegDemuxerFactory(
-      data_source_factory.release(), pipeline_message_loop));
+  scoped_ptr<media::DemuxerFactory> demuxer_factory(
+      new media::FFmpegDemuxerFactory(data_source_factory.release(),
+                                      pipeline_message_loop));
+
+  std::string sourceUrl = GetClient()->sourceURL().spec();

[scherkus (not reviewing), 2011/10/26 18:15:31]

source_url

[acolwell GONE FROM CHROMIUM, 2011/10/26 18:30:46]

Done.

+
+  if (!sourceUrl.empty()) {
+    demuxer_factory.reset(
+        new media::ChunkDemuxerFactory(sourceUrl,
+                                       demuxer_factory.release(),
+                                       proxy_));
+  }
+  filter_collection_->SetDemuxerFactory(demuxer_factory.release());
 
   // Add in the default filter factories.
   filter_collection_->AddAudioDecoder(new media::FFmpegAudioDecoder(
       message_loop_factory_->GetMessageLoop("AudioDecoderThread")));
   filter_collection_->AddVideoDecoder(new media::FFmpegVideoDecoder(
       message_loop_factory_->GetMessageLoop("VideoDecoderThread"), NULL));
   filter_collection_->AddAudioRenderer(new media::NullAudioRenderer());
 
   return true;
 }
@@ skipping 431 matching lines @@
 void WebMediaPlayerImpl::putCurrentFrame(
     WebKit::WebVideoFrame* web_video_frame) {
   if (web_video_frame) {
     scoped_refptr<media::VideoFrame> video_frame(
         WebVideoFrameImpl::toVideoFrame(web_video_frame));
     proxy_->PutCurrentFrame(video_frame);
     delete web_video_frame;
   }
 }
 
-// TODO(acolwell): Uncomment once WebKit changes are checked in.
-// https://bugs.webkit.org/show_bug.cgi?id=64731
-/*
 bool WebMediaPlayerImpl::sourceAppend(const unsigned char* data,
                                       unsigned length) {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   return proxy_->DemuxerAppend(data, length);
 }
 
 void WebMediaPlayerImpl::sourceEndOfStream(
     WebKit::WebMediaPlayer::EndOfStreamStatus status) {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   media::PipelineStatus pipeline_status = media::PIPELINE_OK;
 
   switch(status) {
     case WebKit::WebMediaPlayer::EosNoError:
       break;
     case WebKit::WebMediaPlayer::EosNetworkError:
       pipeline_status = media::PIPELINE_ERROR_NETWORK;
       break;
     case WebKit::WebMediaPlayer::EosDecodeError:
       pipeline_status = media::PIPELINE_ERROR_DECODE;
       break;
     default:
       NOTIMPLEMENTED();
   }
 
   proxy_->DemuxerEndOfStream(pipeline_status);
 }
-*/
 
 void WebMediaPlayerImpl::WillDestroyCurrentMessageLoop() {
   Destroy();
   main_loop_ = NULL;
 }
 
 void WebMediaPlayerImpl::Repaint() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   GetClient()->repaint();
 }
@@ skipping 102 matching lines @@
   DCHECK_EQ(main_loop_, MessageLoop::current());
   if (is_downloading_data)
     SetNetworkState(WebKit::WebMediaPlayer::Loading);
   else
     SetNetworkState(WebKit::WebMediaPlayer::Idle);
 }
 
 void WebMediaPlayerImpl::OnDemuxerOpened() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
 
-  // TODO(acolwell): Uncomment once WebKit changes are checked in.
-  // https://bugs.webkit.org/show_bug.cgi?id=64731
-  //GetClient()->sourceOpened();
+  GetClient()->sourceOpened();
 }
 
 void WebMediaPlayerImpl::SetNetworkState(
     WebKit::WebMediaPlayer::NetworkState state) {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   // Always notify to ensure client has the latest value.
   network_state_ = state;
   GetClient()->networkStateChanged();
 }
 
@@ skipping 45 matching lines @@
   return client_;
 }
 
 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   incremented_externally_allocated_memory_ = true;
   v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);
 }
 
 }  // namespace webkit_glue