Implement sourceAddId() & sourceRemoveId()

webkit/media/webmediaplayer_proxy.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_proxy.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "media/base/pipeline_status.h"
@@ skipping 169 matching lines @@
 void WebMediaPlayerProxy::DemuxerClosed() {
   render_loop_->PostTask(FROM_HERE, base::Bind(
       &WebMediaPlayerProxy::DemuxerClosedTask, this));
 }
 
 void WebMediaPlayerProxy::DemuxerFlush() {
   if (chunk_demuxer_.get())
     chunk_demuxer_->FlushData();
 }
 
-bool WebMediaPlayerProxy::DemuxerAppend(const uint8* data, size_t length) {
-  if (chunk_demuxer_.get())
-    return chunk_demuxer_->AppendData(data, length);
-  return false;
+media::ChunkDemuxer::AddIdStatus WebMediaPlayerProxy::DemuxerAddId(
+    const std::string& id,
+    const std::string& type) {
+  if (!chunk_demuxer_.get())
+    return media::ChunkDemuxer::AisNotSupported;

[scherkus (not reviewing), 2012/04/12 20:58:32]

would we ever get to this case? ditto below

it seems like WebKit should prevent this by firing a bad state exception if the
element wasn't set up for media source, etc... similar to setting currentTime
fires INVALID_STATE_ERR if there's no src

the only other time chunk_demuxer_ would be NULL is if DemuxerClosedTask() was
executed -- at that point would it still be valid to call addID(), etc... ?


basically I'm on a mission to remove a lot of these "well, we might be deleted"
checks from WMPI/WMPP. Would you mind if we remove the checks for media source
and we implement things the right way? :)

[acolwell GONE FROM CHROMIUM, 2012/04/12 22:43:12]

I'll remove them and we'll see what happens. I put them in there a while ago
because I was running into cases where Append() was getting called when
chunk_demuxer_ was null. I believe it had something to do with error handling
where WebKit doesn't know about the error yet, the demuxer gets destroyed, and
JavaScript is running from an event handler and calls Append(). I don't remember
the exact scenario though.

If the crashes come back then I'll see if I can come up with a better solution
and capture the case in a unit test. :)

+
+  return chunk_demuxer_->AddId(id, type);
+}
+
+void WebMediaPlayerProxy::DemuxerRemoveId(const std::string& id) {
+  if (!chunk_demuxer_.get())
+    return;
+
+  chunk_demuxer_->RemoveId(id);
+}
+
+bool WebMediaPlayerProxy::DemuxerAppend(const std::string& id,
+                                        const uint8* data,
+                                        size_t length) {
+  if (!chunk_demuxer_.get())
+    return false;
+
+  return chunk_demuxer_->AppendData(id, data, length);
 }
 
 void WebMediaPlayerProxy::DemuxerEndOfStream(media::PipelineStatus status) {
   if (chunk_demuxer_.get())
     chunk_demuxer_->EndOfStream(status);
 }
 
 void WebMediaPlayerProxy::DemuxerShutdown() {
   if (chunk_demuxer_.get())
     chunk_demuxer_->Shutdown();
 }
 
 void WebMediaPlayerProxy::DemuxerOpenedTask(
     const scoped_refptr<media::ChunkDemuxer>& demuxer) {
   DCHECK(render_loop_->BelongsToCurrentThread());
   chunk_demuxer_ = demuxer;
   if (webmediaplayer_)
     webmediaplayer_->OnDemuxerOpened();
 }
 
 void WebMediaPlayerProxy::DemuxerClosedTask() {
   chunk_demuxer_ = NULL;
 }
 
 }  // namespace webkit_media