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

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

Issue 560563002: Add default impl for DemuxerStream::EnableBitstreamConverter(); (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 // kPendingDemuxerRead or kPendingDecrypt state, waits for the pending 42 // kPendingDemuxerRead or kPendingDecrypt state, waits for the pending
43 // operation to finish before satisfying |closure|. Sets the state to 43 // operation to finish before satisfying |closure|. Sets the state to
44 // kUninitialized if |this| hasn't been initialized, or to kIdle otherwise. 44 // kUninitialized if |this| hasn't been initialized, or to kIdle otherwise.
45 void Reset(const base::Closure& closure); 45 void Reset(const base::Closure& closure);
46 46
47 // DemuxerStream implementation. 47 // DemuxerStream implementation.
48 virtual void Read(const ReadCB& read_cb) OVERRIDE; 48 virtual void Read(const ReadCB& read_cb) OVERRIDE;
49 virtual AudioDecoderConfig audio_decoder_config() OVERRIDE; 49 virtual AudioDecoderConfig audio_decoder_config() OVERRIDE;
50 virtual VideoDecoderConfig video_decoder_config() OVERRIDE; 50 virtual VideoDecoderConfig video_decoder_config() OVERRIDE;
51 virtual Type type() OVERRIDE; 51 virtual Type type() OVERRIDE;
52 virtual void EnableBitstreamConverter() OVERRIDE;
53 virtual bool SupportsConfigChanges() OVERRIDE; 52 virtual bool SupportsConfigChanges() OVERRIDE;
54 virtual VideoRotation video_rotation() OVERRIDE; 53 virtual VideoRotation video_rotation() OVERRIDE;
55 54
56 private: 55 private:
57 // For a detailed state diagram please see this link: http://goo.gl/8jAok 56 // For a detailed state diagram please see this link: http://goo.gl/8jAok
58 // TODO(xhwang): Add a ASCII state diagram in this file after this class 57 // TODO(xhwang): Add a ASCII state diagram in this file after this class
59 // stabilizes. 58 // stabilizes.
60 // TODO(xhwang): Update this diagram for DecryptingDemuxerStream. 59 // TODO(xhwang): Update this diagram for DecryptingDemuxerStream.
61 enum State { 60 enum State {
62 kUninitialized = 0, 61 kUninitialized = 0,
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 // NOTE: Weak pointers must be invalidated before all other member variables. 126 // NOTE: Weak pointers must be invalidated before all other member variables.
128 base::WeakPtrFactory<DecryptingDemuxerStream> weak_factory_; 127 base::WeakPtrFactory<DecryptingDemuxerStream> weak_factory_;
129 base::WeakPtr<DecryptingDemuxerStream> weak_this_; 128 base::WeakPtr<DecryptingDemuxerStream> weak_this_;
130 129
131 DISALLOW_COPY_AND_ASSIGN(DecryptingDemuxerStream); 130 DISALLOW_COPY_AND_ASSIGN(DecryptingDemuxerStream);
132 }; 131 };
133 132
134 } // namespace media 133 } // namespace media
135 134
136 #endif // MEDIA_FILTERS_DECRYPTING_DEMUXER_STREAM_H_ 135 #endif // MEDIA_FILTERS_DECRYPTING_DEMUXER_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698