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

Unified Diff: media/filters/decoder_selector.h

Issue 141243003: Add AudioBufferStream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@decoderstream_rebased
Patch Set: Rebase! Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/audio_renderer_impl_unittest.cc ('k') | media/filters/decoder_selector.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/decoder_selector.h
diff --git a/media/filters/decoder_selector.h b/media/filters/decoder_selector.h
index aa0b8a42ed737333f070ed994ebb8bcd71d5a624..bdf643e74d53ef5aaccbdb6823141ec479460f24 100644
--- a/media/filters/decoder_selector.h
+++ b/media/filters/decoder_selector.h
@@ -65,7 +65,6 @@ class MEDIA_EXPORT DecoderSelector {
// Selected Decoder (and DecryptingDemuxerStream) is returned via
// the |select_decoder_cb|.
void SelectDecoder(DemuxerStream* stream,
- StatisticsCB statistics_cb,
const SelectDecoderCB& select_decoder_cb);
// Aborts pending Decoder selection and fires |select_decoder_cb| with
@@ -78,7 +77,6 @@ class MEDIA_EXPORT DecoderSelector {
void InitializeDecoder();
void DecoderInitDone(PipelineStatus status);
void ReturnNullDecoder();
- void DoInitializeDecoder(const PipelineStatusCB& status_cb);
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
ScopedVector<Decoder> decoders_;
@@ -87,8 +85,6 @@ class MEDIA_EXPORT DecoderSelector {
DemuxerStream* input_stream_;
SelectDecoderCB select_decoder_cb_;
- StatisticsCB statistics_cb_;
-
scoped_ptr<Decoder> decoder_;
scoped_ptr<DecryptingDemuxerStream> decrypted_stream_;
@@ -100,10 +96,6 @@ class MEDIA_EXPORT DecoderSelector {
typedef DecoderSelector<DemuxerStream::VIDEO> VideoDecoderSelector;
typedef DecoderSelector<DemuxerStream::AUDIO> AudioDecoderSelector;
-template <>
-void AudioDecoderSelector::DoInitializeDecoder(
- const PipelineStatusCB& status_cb);
-
} // namespace media
#endif // MEDIA_FILTERS_DECODER_SELECTOR_H_
« no previous file with comments | « media/filters/audio_renderer_impl_unittest.cc ('k') | media/filters/decoder_selector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698