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

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

Issue 363813002: Update to Pipeline Metadata and Decoder Stream for Orientation Data (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed unneeded variable Created 6 years, 5 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 | Annotate | Revision Log
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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 // (e.g. PpapiDecryptor), the pending DecryptCB would not be satisfied. 49 // (e.g. PpapiDecryptor), the pending DecryptCB would not be satisfied.
50 void Stop(const base::Closure& closure); 50 void Stop(const base::Closure& closure);
51 51
52 // DemuxerStream implementation. 52 // DemuxerStream implementation.
53 virtual void Read(const ReadCB& read_cb) OVERRIDE; 53 virtual void Read(const ReadCB& read_cb) OVERRIDE;
54 virtual AudioDecoderConfig audio_decoder_config() OVERRIDE; 54 virtual AudioDecoderConfig audio_decoder_config() OVERRIDE;
55 virtual VideoDecoderConfig video_decoder_config() OVERRIDE; 55 virtual VideoDecoderConfig video_decoder_config() OVERRIDE;
56 virtual Type type() OVERRIDE; 56 virtual Type type() OVERRIDE;
57 virtual void EnableBitstreamConverter() OVERRIDE; 57 virtual void EnableBitstreamConverter() OVERRIDE;
58 virtual bool SupportsConfigChanges() OVERRIDE; 58 virtual bool SupportsConfigChanges() OVERRIDE;
59 virtual VideoRotation video_rotation() OVERRIDE;
59 60
60 private: 61 private:
61 // For a detailed state diagram please see this link: http://goo.gl/8jAok 62 // For a detailed state diagram please see this link: http://goo.gl/8jAok
62 // TODO(xhwang): Add a ASCII state diagram in this file after this class 63 // TODO(xhwang): Add a ASCII state diagram in this file after this class
63 // stabilizes. 64 // stabilizes.
64 // TODO(xhwang): Update this diagram for DecryptingDemuxerStream. 65 // TODO(xhwang): Update this diagram for DecryptingDemuxerStream.
65 enum State { 66 enum State {
66 kUninitialized = 0, 67 kUninitialized = 0,
67 kDecryptorRequested, 68 kDecryptorRequested,
68 kIdle, 69 kIdle,
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 // NOTE: Weak pointers must be invalidated before all other member variables. 131 // NOTE: Weak pointers must be invalidated before all other member variables.
131 base::WeakPtrFactory<DecryptingDemuxerStream> weak_factory_; 132 base::WeakPtrFactory<DecryptingDemuxerStream> weak_factory_;
132 base::WeakPtr<DecryptingDemuxerStream> weak_this_; 133 base::WeakPtr<DecryptingDemuxerStream> weak_this_;
133 134
134 DISALLOW_COPY_AND_ASSIGN(DecryptingDemuxerStream); 135 DISALLOW_COPY_AND_ASSIGN(DecryptingDemuxerStream);
135 }; 136 };
136 137
137 } // namespace media 138 } // namespace media
138 139
139 #endif // MEDIA_FILTERS_DECRYPTING_DEMUXER_STREAM_H_ 140 #endif // MEDIA_FILTERS_DECRYPTING_DEMUXER_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698