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

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

Issue 23702007: Render inband text tracks in the media pipeline (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: incorporate aaron's comments (10/16) Created 7 years, 2 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
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/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 27 matching lines...) Expand all
38 38
39 // Cancels all pending operations and fires all pending callbacks. Sets 39 // Cancels all pending operations and fires all pending callbacks. Sets
40 // |this| to kUninitialized state if |this| hasn't been initialized, or to 40 // |this| to kUninitialized state if |this| hasn't been initialized, or to
41 // kIdle state otherwise. 41 // kIdle state otherwise.
42 void Reset(const base::Closure& closure); 42 void Reset(const base::Closure& closure);
43 43
44 // DemuxerStream implementation. 44 // DemuxerStream implementation.
45 virtual void Read(const ReadCB& read_cb) OVERRIDE; 45 virtual void Read(const ReadCB& read_cb) OVERRIDE;
46 virtual AudioDecoderConfig audio_decoder_config() OVERRIDE; 46 virtual AudioDecoderConfig audio_decoder_config() OVERRIDE;
47 virtual VideoDecoderConfig video_decoder_config() OVERRIDE; 47 virtual VideoDecoderConfig video_decoder_config() OVERRIDE;
48 virtual TextTrackConfig text_track_config() OVERRIDE;
48 virtual Type type() OVERRIDE; 49 virtual Type type() OVERRIDE;
49 virtual void EnableBitstreamConverter() OVERRIDE; 50 virtual void EnableBitstreamConverter() OVERRIDE;
50 51
51 private: 52 private:
52 // For a detailed state diagram please see this link: http://goo.gl/8jAok 53 // For a detailed state diagram please see this link: http://goo.gl/8jAok
53 // TODO(xhwang): Add a ASCII state diagram in this file after this class 54 // TODO(xhwang): Add a ASCII state diagram in this file after this class
54 // stabilizes. 55 // stabilizes.
55 // TODO(xhwang): Update this diagram for DecryptingDemuxerStream. 56 // TODO(xhwang): Update this diagram for DecryptingDemuxerStream.
56 enum State { 57 enum State {
57 kUninitialized = 0, 58 kUninitialized = 0,
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 // If this variable is true and kNoKey is returned then we need to try 119 // If this variable is true and kNoKey is returned then we need to try
119 // decrypting again in case the newly added key is the correct decryption key. 120 // decrypting again in case the newly added key is the correct decryption key.
120 bool key_added_while_decrypt_pending_; 121 bool key_added_while_decrypt_pending_;
121 122
122 DISALLOW_COPY_AND_ASSIGN(DecryptingDemuxerStream); 123 DISALLOW_COPY_AND_ASSIGN(DecryptingDemuxerStream);
123 }; 124 };
124 125
125 } // namespace media 126 } // namespace media
126 127
127 #endif // MEDIA_FILTERS_DECRYPTING_DEMUXER_STREAM_H_ 128 #endif // MEDIA_FILTERS_DECRYPTING_DEMUXER_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698