Implement sourceAddId() & sourceRemoveId()

media/filters/chunk_demuxer.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 "media/filters/chunk_demuxer.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/data_buffer.h"
 #include "media/base/video_decoder_config.h"
 #include "media/filters/chunk_demuxer_client.h"
 #include "media/webm/webm_stream_parser.h"
 
 namespace media {
 
+// TODO(acolwell): Remove this when fixing http://crbug.com/122909 .
+const char* kDefaultSourceType = "video/webm; codecs=\"vp8, vorbis\"";
+
 // Create an "end of stream" buffer.
 static Buffer* CreateEOSBuffer() {
   return new DataBuffer(0);
 }
 
 class ChunkDemuxerStream : public DemuxerStream {
  public:
   typedef std::deque<scoped_refptr<Buffer> > BufferQueue;
   typedef std::deque<ReadCB> ReadCBQueue;
   typedef std::deque<base::Closure> ClosureQueue;
@@ skipping 420 matching lines @@
   if (video_.get())
     video_->Flush();
 
   byte_queue_.Reset();
   stream_parser_->Flush();
 
   seek_waits_for_data_ = true;
   ChangeState_Locked(INITIALIZED);
 }
 
-bool ChunkDemuxer::AppendData(const uint8* data, size_t length) {
-  DVLOG(1) << "AppendData(" << length << ")";
+ChunkDemuxer::Status ChunkDemuxer::AddId(const std::string& id,
+                                         const std::string& type) {
+  // TODO(acolwell): Proper mimetype decoding and support for more than one ID
+  // will be added as part of http://crbug.com/122909
+  if (type != kDefaultSourceType)
+    return kNotSupported;
 
-  if (!data || length == 0u)
+  if (!source_id_.empty())
+    return kReachedIdLimit;
+
+  source_id_ = id;
+  return kOk;
+}
+
+bool ChunkDemuxer::RemoveId(const std::string& id) {
+  DCHECK(!source_id_.empty());
+  DCHECK_EQ(source_id_, id);
+  source_id_ = "";
+  return true;
+}
+
+bool ChunkDemuxer::AppendData(const std::string& id,
+                              const uint8* data,
+                              size_t length) {
+  DVLOG(1) << "AppendData(" << id << ", " << length << ")";
+
+  // TODO(acolwell): Remove when http://webk.it/83788 fix lands.
+  if (source_id_.empty())
+    AddId(id, kDefaultSourceType);
+
+  DCHECK(!source_id_.empty());
+  DCHECK_EQ(source_id_, id);
+
+  if (id.empty() || !data || length == 0u)
     return false;

[scherkus (not reviewing), 2012/04/23 19:24:17]

documentation states false is returned when in an invalid state (i.e,. below)
but these seem more of the DCHECK/CHECK variety, no?

[acolwell GONE FROM CHROMIUM, 2012/04/23 22:15:23]

Done.

 
   int64 buffered_bytes = 0;
   base::TimeDelta buffered_ts = base::TimeDelta::FromSeconds(-1);
 
   PipelineStatusCB cb;
   {
     base::AutoLock auto_lock(lock_);
 
     byte_queue_.Push(data, length);
 
@@ skipping 241 matching lines @@
   if (!video_->CanAddBuffers(buffers))
     return false;
 
   video_->AddBuffers(buffers);
   seek_waits_for_data_ = false;
 
   return true;
 }
 
 }  // namespace media