Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(131)

Side by Side Diff: media/filters/chunk_demuxer.h

Issue 2698713003: Remove enabled/set_enabled from DemuxerStream interface (Closed)
Patch Set: cast_shell build fix Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/base/mock_filters.h ('k') | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_FILTERS_CHUNK_DEMUXER_H_ 5 #ifndef MEDIA_FILTERS_CHUNK_DEMUXER_H_
6 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_ 6 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 void UnmarkEndOfStream(); 107 void UnmarkEndOfStream();
108 108
109 // DemuxerStream methods. 109 // DemuxerStream methods.
110 void Read(const ReadCB& read_cb) override; 110 void Read(const ReadCB& read_cb) override;
111 Type type() const override; 111 Type type() const override;
112 Liveness liveness() const override; 112 Liveness liveness() const override;
113 AudioDecoderConfig audio_decoder_config() override; 113 AudioDecoderConfig audio_decoder_config() override;
114 VideoDecoderConfig video_decoder_config() override; 114 VideoDecoderConfig video_decoder_config() override;
115 bool SupportsConfigChanges() override; 115 bool SupportsConfigChanges() override;
116 VideoRotation video_rotation() override; 116 VideoRotation video_rotation() override;
117 bool enabled() const override; 117
118 void set_enabled(bool enabled, base::TimeDelta timestamp) override; 118 bool enabled() const;
119 void set_enabled(bool enabled, base::TimeDelta timestamp);
119 120
120 void SetStreamStatusChangeCB(const StreamStatusChangeCB& cb); 121 void SetStreamStatusChangeCB(const StreamStatusChangeCB& cb);
121 122
122 // Returns the text track configuration. It is an error to call this method 123 // Returns the text track configuration. It is an error to call this method
123 // if type() != TEXT. 124 // if type() != TEXT.
124 TextTrackConfig text_track_config(); 125 TextTrackConfig text_track_config();
125 126
126 // Sets the memory limit, in bytes, on the SourceBufferStream. 127 // Sets the memory limit, in bytes, on the SourceBufferStream.
127 void SetStreamMemoryLimit(size_t memory_limit); 128 void SetStreamMemoryLimit(size_t memory_limit);
128 129
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 // released SourceBufferState objects. Demuxer clients might still have 447 // released SourceBufferState objects. Demuxer clients might still have
447 // references to these streams, so we need to keep them alive. But they'll be 448 // references to these streams, so we need to keep them alive. But they'll be
448 // in a shut down state, so reading from them will return EOS. 449 // in a shut down state, so reading from them will return EOS.
449 std::vector<std::unique_ptr<ChunkDemuxerStream>> removed_streams_; 450 std::vector<std::unique_ptr<ChunkDemuxerStream>> removed_streams_;
450 451
451 // Accumulate, by type, detected track counts across the SourceBuffers. 452 // Accumulate, by type, detected track counts across the SourceBuffers.
452 int detected_audio_track_count_; 453 int detected_audio_track_count_;
453 int detected_video_track_count_; 454 int detected_video_track_count_;
454 int detected_text_track_count_; 455 int detected_text_track_count_;
455 456
456 std::map<MediaTrack::Id, DemuxerStream*> track_id_to_demux_stream_map_; 457 std::map<MediaTrack::Id, ChunkDemuxerStream*> track_id_to_demux_stream_map_;
457 458
458 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer); 459 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
459 }; 460 };
460 461
461 } // namespace media 462 } // namespace media
462 463
463 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_ 464 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_
OLDNEW
« no previous file with comments | « media/base/mock_filters.h ('k') | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698