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

Side by Side Diff: media/filters/decrypting_demuxer_stream.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/filters/chunk_demuxer_unittest.cc ('k') | media/filters/decrypting_demuxer_stream.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_DECRYPTING_DEMUXER_STREAM_H_ 5 #ifndef MEDIA_FILTERS_DECRYPTING_DEMUXER_STREAM_H_
6 #define MEDIA_FILTERS_DECRYPTING_DEMUXER_STREAM_H_ 6 #define MEDIA_FILTERS_DECRYPTING_DEMUXER_STREAM_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 55
56 // DemuxerStream implementation. 56 // DemuxerStream implementation.
57 void Read(const ReadCB& read_cb) override; 57 void Read(const ReadCB& read_cb) override;
58 AudioDecoderConfig audio_decoder_config() override; 58 AudioDecoderConfig audio_decoder_config() override;
59 VideoDecoderConfig video_decoder_config() override; 59 VideoDecoderConfig video_decoder_config() override;
60 Type type() const override; 60 Type type() const override;
61 Liveness liveness() const override; 61 Liveness liveness() const override;
62 void EnableBitstreamConverter() override; 62 void EnableBitstreamConverter() override;
63 bool SupportsConfigChanges() override; 63 bool SupportsConfigChanges() override;
64 VideoRotation video_rotation() override; 64 VideoRotation video_rotation() override;
65 bool enabled() const override;
66 void set_enabled(bool enabled, base::TimeDelta timestamp) override;
67 65
68 private: 66 private:
69 // For a detailed state diagram please see this link: http://goo.gl/8jAok 67 // For a detailed state diagram please see this link: http://goo.gl/8jAok
70 // TODO(xhwang): Add a ASCII state diagram in this file after this class 68 // TODO(xhwang): Add a ASCII state diagram in this file after this class
71 // stabilizes. 69 // stabilizes.
72 // TODO(xhwang): Update this diagram for DecryptingDemuxerStream. 70 // TODO(xhwang): Update this diagram for DecryptingDemuxerStream.
73 enum State { 71 enum State {
74 kUninitialized = 0, 72 kUninitialized = 0,
75 kIdle, 73 kIdle,
76 kPendingDemuxerRead, 74 kPendingDemuxerRead,
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 130
133 base::WeakPtr<DecryptingDemuxerStream> weak_this_; 131 base::WeakPtr<DecryptingDemuxerStream> weak_this_;
134 base::WeakPtrFactory<DecryptingDemuxerStream> weak_factory_; 132 base::WeakPtrFactory<DecryptingDemuxerStream> weak_factory_;
135 133
136 DISALLOW_COPY_AND_ASSIGN(DecryptingDemuxerStream); 134 DISALLOW_COPY_AND_ASSIGN(DecryptingDemuxerStream);
137 }; 135 };
138 136
139 } // namespace media 137 } // namespace media
140 138
141 #endif // MEDIA_FILTERS_DECRYPTING_DEMUXER_STREAM_H_ 139 #endif // MEDIA_FILTERS_DECRYPTING_DEMUXER_STREAM_H_
OLDNEW
« no previous file with comments | « media/filters/chunk_demuxer_unittest.cc ('k') | media/filters/decrypting_demuxer_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698