Support for parsing encrypted WebM streams by src.

webkit/media/webmediaplayer_impl.cc

 // Copyright (c) 2012 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 <vector>
 
@@ skipping 256 matching lines @@
       url, static_cast<BufferedResourceLoader::CORSMode>(cors_mode),
       base::Bind(
           &WebMediaPlayerImpl::DataSourceInitialized,
           AsWeakPtr(), gurl));
 
   is_local_source_ = !gurl.SchemeIs("http") && !gurl.SchemeIs("https");
 
   BuildDefaultCollection(proxy_->data_source(),
                          message_loop_factory_.get(),
                          filter_collection_.get(),
-                         &decryptor_);
+                         &decryptor_,
+                         base::Bind(&WebMediaPlayerImpl::SendNeedKey,
+                                    base::Unretained(this)));
 }
 
 void WebMediaPlayerImpl::cancelLoad() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
 }
 
 void WebMediaPlayerImpl::play() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
 
   paused_ = false;
@@ skipping 593 matching lines @@
 
   GetClient()->sourceOpened();
 }
 
 void WebMediaPlayerImpl::OnKeyAdded(const std::string& key_system,
                                     const std::string& session_id) {
   DCHECK_EQ(main_loop_, MessageLoop::current());
 
   GetClient()->keyAdded(WebString::fromUTF8(key_system),
                         WebString::fromUTF8(session_id));
+  pipeline_->KeyAdded();
 }
 
 void WebMediaPlayerImpl::OnNeedKey(const std::string& key_system,
                                    const std::string& session_id,
                                    scoped_array<uint8> init_data,
                                    int init_data_size) {
   DCHECK_EQ(main_loop_, MessageLoop::current());
 
   GetClient()->keyNeeded(WebString::fromUTF8(key_system),
                          WebString::fromUTF8(session_id),
                          init_data.get(),
                          init_data_size);
 }
 
+bool WebMediaPlayerImpl::SendNeedKey(scoped_array<uint8> init_data,
+                                     int init_data_size) {
+  proxy_->DemuxerNeedKey(init_data.Pass(), init_data_size);

[ddorwin, 2012/08/22 23:20:29]

Why is this different from the above? Isn't the chunk demuxer using the above?

[fgalligan1, 2012/08/23 02:39:11]

Because right now the the interface is defined in ChunkDemuxer. I didn't have
time to split it out. That was my plan to move the interface definition from
ChunkDemuxer to somewhere else and have both ChunkDemuxer and FFMpegDemuxer
implement the interface.

[ddorwin, 2012/08/24 00:20:30]

Okay, maybe a media/base version of ChunkDemuxerClient, which maybe
ChunkDemuxerClient inherits from.

Can you avoid SendNeedKey by binding the proxy directly above. Probably
irrelevant since we would just do the above refactoring before committing,
though.

[fgalligan1, 2012/08/24 20:01:26]

Removed SendNeedKey

+  return true;
+}
+
 #define COMPILE_ASSERT_MATCHING_ENUM(name) \
   COMPILE_ASSERT(static_cast<int>(WebKit::WebMediaPlayerClient::name) == \
                  static_cast<int>(media::Decryptor::k ## name), \
                  mismatching_enums)
 COMPILE_ASSERT_MATCHING_ENUM(UnknownError);
 COMPILE_ASSERT_MATCHING_ENUM(ClientError);
 COMPILE_ASSERT_MATCHING_ENUM(ServiceError);
 COMPILE_ASSERT_MATCHING_ENUM(OutputError);
 COMPILE_ASSERT_MATCHING_ENUM(HardwareChangeError);
 COMPILE_ASSERT_MATCHING_ENUM(DomainError);
@@ skipping 135 matching lines @@
   return audio_source_provider_;
 }
 
 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   incremented_externally_allocated_memory_ = true;
   v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);
 }
 
 }  // namespace webkit_media