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

Unified Diff: media/filters/decoder_stream.h

Issue 2837613004: media: Support better decoder switching (Closed)
Patch Set: update GetDisplayName() comments Created 3 years, 7 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
Index: media/filters/decoder_stream.h
diff --git a/media/filters/decoder_stream.h b/media/filters/decoder_stream.h
index 97ab9705e342091e3e8cf6aa01b890da05e8a062..c9eed2203799f7f7e4b97488abd6de88aea5353e 100644
--- a/media/filters/decoder_stream.h
+++ b/media/filters/decoder_stream.h
@@ -50,14 +50,17 @@ class MEDIA_EXPORT DecoderStream {
DECODE_ERROR, // Decoder returned decode error.
};
+ // Callback to create a list of decoders.
+ using CreateDecodersCB = base::RepeatingCallback<ScopedVector<Decoder>()>;
+
// Indicates completion of a DecoderStream initialization.
- typedef base::Callback<void(bool success)> InitCB;
+ using InitCB = base::Callback<void(bool success)>;
// Indicates completion of a DecoderStream read.
- typedef base::Callback<void(Status, const scoped_refptr<Output>&)> ReadCB;
+ using ReadCB = base::Callback<void(Status, const scoped_refptr<Output>&)>;
DecoderStream(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
- ScopedVector<Decoder> decoders,
+ CreateDecodersCB create_decoders_cb,
MediaLog* media_log);
virtual ~DecoderStream();
@@ -211,6 +214,10 @@ class MEDIA_EXPORT DecoderStream {
// Whether |decoder_| has produced a frame yet. Reset on fallback.
bool decoder_produced_a_frame_;
+ // Whether we are on a fallback decoder. Used to make sure we at most fallback
watk 2017/05/04 21:35:33 What about instead of "on a fallback decoder" we s
xhwang 2017/05/04 23:53:14 How about has_fallen_back_once_on_decode_error_ ?
+ // once, to prevent issues like fallback infinitely.
watk 2017/05/04 21:35:33 s/fallback infinitely/infinite fallback/
xhwang 2017/05/04 23:53:14 Done.
+ bool is_on_fallback_decoder_;
+
std::unique_ptr<DecryptingDemuxerStream> decrypting_demuxer_stream_;
ConfigChangeObserverCB config_change_observer_cb_;

Powered by Google App Engine
This is Rietveld 408576698