Add support for cancellation of demuxer reads.

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 <stddef.h>
 #include <stdint.h>
 
@@ skipping 183 matching lines @@
   //   otherwise ignore them.
   void Initialize(DemuxerHost* host,
                   const PipelineStatusCB& cb,
                   bool enable_text_tracks) override;
   void Stop() override;
   void Seek(base::TimeDelta time, const PipelineStatusCB& cb) override;
   base::Time GetTimelineOffset() const override;
   DemuxerStream* GetStream(DemuxerStream::Type type) override;
   base::TimeDelta GetStartTime() const override;
   int64_t GetMemoryUsage() const override;
+  void AbortPendingReads() override;
 
   // ChunkDemuxer reads are abortable. StartWaitingForSeek() and
   // CancelPendingSeek() always abort pending and future reads until the
   // expected seek occurs, so that ChunkDemuxer can stay synchronized with the
   // associated JS method calls.
   void StartWaitingForSeek(base::TimeDelta seek_time) override;
   void CancelPendingSeek(base::TimeDelta seek_time) override;
 
   // Registers a new |id| to use for AppendData() calls. |type| indicates
   // the MIME type for the data that we intend to append for this ID.
@@ skipping 152 matching lines @@
   // Sets |duration_| to |new_duration|, sets |user_specified_duration_| to -1
   // and notifies |host_|.
   void UpdateDuration(base::TimeDelta new_duration);
 
   // Returns the ranges representing the buffered data in the demuxer.
   Ranges<base::TimeDelta> GetBufferedRanges_Locked() const;
 
   // Start returning data on all DemuxerStreams.
   void StartReturningData();
 
-  // Aborts pending reads on all DemuxerStreams.
-  void AbortPendingReads();
+  void AbortPendingReads_Locked();
 
   // Completes any pending reads if it is possible to do so.
   void CompletePendingReadsIfPossible();
 
   // Seeks all SourceBufferStreams to |seek_time|.
   void SeekAllSources(base::TimeDelta seek_time);
 
   // Generates and returns a unique media track id.
   static MediaTrack::Id GenerateMediaTrackId();
 
@@ skipping 57 matching lines @@
   int detected_text_track_count_;
 
   std::map<MediaTrack::Id, const DemuxerStream*> track_id_to_demux_stream_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_CHUNK_DEMUXER_H_