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

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

Issue 692323002: Move Liveness from DemuxerStreamProvider to DemuxerStream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix mojo Created 6 years, 1 month 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.cc ('k') | media/filters/decoder_selector.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_DECODER_SELECTOR_H_ 5 #ifndef MEDIA_FILTERS_DECODER_SELECTOR_H_
6 #define MEDIA_FILTERS_DECODER_SELECTOR_H_ 6 #define MEDIA_FILTERS_DECODER_SELECTOR_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/scoped_vector.h" 10 #include "base/memory/scoped_vector.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 const SetDecryptorReadyCB& set_decryptor_ready_cb); 59 const SetDecryptorReadyCB& set_decryptor_ready_cb);
60 60
61 // Aborts pending Decoder selection and fires |select_decoder_cb| with 61 // Aborts pending Decoder selection and fires |select_decoder_cb| with
62 // NULL and NULL immediately if it's pending. 62 // NULL and NULL immediately if it's pending.
63 ~DecoderSelector(); 63 ~DecoderSelector();
64 64
65 // Initializes and selects a Decoder that can decode the |stream|. 65 // Initializes and selects a Decoder that can decode the |stream|.
66 // Selected Decoder (and DecryptingDemuxerStream) is returned via 66 // Selected Decoder (and DecryptingDemuxerStream) is returned via
67 // the |select_decoder_cb|. 67 // the |select_decoder_cb|.
68 void SelectDecoder(DemuxerStream* stream, 68 void SelectDecoder(DemuxerStream* stream,
69 bool low_delay,
70 const SelectDecoderCB& select_decoder_cb, 69 const SelectDecoderCB& select_decoder_cb,
71 const typename Decoder::OutputCB& output_cb); 70 const typename Decoder::OutputCB& output_cb);
72 71
73 private: 72 private:
74 void DecryptingDecoderInitDone(PipelineStatus status); 73 void DecryptingDecoderInitDone(PipelineStatus status);
75 void DecryptingDemuxerStreamInitDone(PipelineStatus status); 74 void DecryptingDemuxerStreamInitDone(PipelineStatus status);
76 void InitializeDecoder(); 75 void InitializeDecoder();
77 void DecoderInitDone(PipelineStatus status); 76 void DecoderInitDone(PipelineStatus status);
78 void ReturnNullDecoder(); 77 void ReturnNullDecoder();
79 78
80 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 79 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
81 ScopedVector<Decoder> decoders_; 80 ScopedVector<Decoder> decoders_;
82 SetDecryptorReadyCB set_decryptor_ready_cb_; 81 SetDecryptorReadyCB set_decryptor_ready_cb_;
83 82
84 DemuxerStream* input_stream_; 83 DemuxerStream* input_stream_;
85 bool low_delay_;
86 SelectDecoderCB select_decoder_cb_; 84 SelectDecoderCB select_decoder_cb_;
87 typename Decoder::OutputCB output_cb_; 85 typename Decoder::OutputCB output_cb_;
88 86
89 scoped_ptr<Decoder> decoder_; 87 scoped_ptr<Decoder> decoder_;
90 scoped_ptr<DecryptingDemuxerStream> decrypted_stream_; 88 scoped_ptr<DecryptingDemuxerStream> decrypted_stream_;
91 89
92 // NOTE: Weak pointers must be invalidated before all other member variables. 90 // NOTE: Weak pointers must be invalidated before all other member variables.
93 base::WeakPtrFactory<DecoderSelector> weak_ptr_factory_; 91 base::WeakPtrFactory<DecoderSelector> weak_ptr_factory_;
94 92
95 DISALLOW_IMPLICIT_CONSTRUCTORS(DecoderSelector); 93 DISALLOW_IMPLICIT_CONSTRUCTORS(DecoderSelector);
96 }; 94 };
97 95
98 typedef DecoderSelector<DemuxerStream::VIDEO> VideoDecoderSelector; 96 typedef DecoderSelector<DemuxerStream::VIDEO> VideoDecoderSelector;
99 typedef DecoderSelector<DemuxerStream::AUDIO> AudioDecoderSelector; 97 typedef DecoderSelector<DemuxerStream::AUDIO> AudioDecoderSelector;
100 98
101 } // namespace media 99 } // namespace media
102 100
103 #endif // MEDIA_FILTERS_DECODER_SELECTOR_H_ 101 #endif // MEDIA_FILTERS_DECODER_SELECTOR_H_
OLDNEW
« no previous file with comments | « media/filters/chunk_demuxer.cc ('k') | media/filters/decoder_selector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698