Implement sourceAddId() & sourceRemoveId()

media/filters/chunk_demuxer.h

 // 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.
 
 #ifndef MEDIA_FILTERS_CHUNK_DEMUXER_H_
 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_
 
 #include <list>
+#include <string>
 
 #include "base/synchronization/lock.h"
 #include "media/base/byte_queue.h"
 #include "media/base/demuxer.h"
 #include "media/base/stream_parser.h"
 
 namespace media {
 
 class ChunkDemuxerClient;
 class ChunkDemuxerStream;
 class FFmpegURLProtocol;
 
 // Demuxer implementation that allows chunks of media data to be passed
 // from JavaScript to the media stack.
 class MEDIA_EXPORT ChunkDemuxer : public Demuxer, public StreamParserHost {
  public:
+  // Status codes for AddId() method.
+  enum AddIdStatus {
+    AisNoError,         // ID added w/o error.

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

I'm calling silliness on the naming here!

1) Why not "Status" -- are we going to have multiple status codes very soon? I
don't see anything in the spec that hints at additional status codes
2) Constants are kCamelCase
3) "Ais" is confusing: is it "A prefix, the word 'is'" (as in "A, isNoError") or
short for AddIdStatus (as in "AddIdStatus NoError")
4) kOK is a pithier way of saying AisNoError (bonus: matches the new status
codes added to BufferedResourceLoader!)

If we go with just "Status" we could clear up all this stuff by having:

enum Status {
  kOK,
  kNotSupported,
  kReachedIdLimit,
};

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

Done.

+    AisNotSupported,    // Type specified is not supported.
+    AisReachedIdLimit,  // Reached ID limit. We can't handle any more IDs.
+  };
+
   explicit ChunkDemuxer(ChunkDemuxerClient* client);
   virtual ~ChunkDemuxer();
 
   // Demuxer implementation.
   virtual void Initialize(DemuxerHost* host,
                           const PipelineStatusCB& cb) OVERRIDE;
   virtual void Stop(const base::Closure& callback) OVERRIDE;
   virtual void Seek(base::TimeDelta time, const PipelineStatusCB&  cb) OVERRIDE;
   virtual void OnAudioRendererDisabled() OVERRIDE;
   virtual scoped_refptr<DemuxerStream> GetStream(
       DemuxerStream::Type type) OVERRIDE;
   virtual base::TimeDelta GetStartTime() const OVERRIDE;
   virtual int GetBitrate() OVERRIDE;
   virtual bool IsLocalSource() OVERRIDE;
   virtual bool IsSeekable() OVERRIDE;
 
   // Methods used by an external object to control this demuxer.
   void FlushData();
 
   // Appends media data to the stream. Returns false if this method
   // is called in an invalid state.

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

docs need updating

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

Done.

-  bool AppendData(const uint8* data, size_t length);
+  AddIdStatus AddId(const std::string& id, const std::string& type);
+  void RemoveId(const std::string& id);
+  bool AppendData(const std::string& id, const uint8* data, size_t length);
   void EndOfStream(PipelineStatus status);
   bool HasEnded();
   void Shutdown();
 
  private:
   enum State {
     WAITING_FOR_INIT,
     INITIALIZING,
     INITIALIZED,
     ENDED,
@@ skipping 31 matching lines @@
   base::TimeDelta duration_;
 
   scoped_ptr<StreamParser> stream_parser_;
 
   // Should a Seek() call wait for more data before calling the
   // callback.
   bool seek_waits_for_data_;
 
   ByteQueue byte_queue_;
 
+  // TODO(acolwell): Remove this when fixing http://crbug.com/122909 .
+  std::string source_id_;
+
   DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_CHUNK_DEMUXER_H_