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

Unified Diff: media/filters/decoder_stream_traits.h

Issue 935243002: Decryptors can report kNoKey to WebMediaPlayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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_traits.h
diff --git a/media/filters/decoder_stream_traits.h b/media/filters/decoder_stream_traits.h
index 707ff1ca27fca0bbb8f49d68e16474d0fdd52890..ffb265e209c9e45501819e526a171832dd2f1199 100644
--- a/media/filters/decoder_stream_traits.h
+++ b/media/filters/decoder_stream_traits.h
@@ -30,10 +30,12 @@ struct DecoderStreamTraits<DemuxerStream::AUDIO> {
typedef base::Callback<void(const scoped_refptr<OutputType>&)> OutputCB;
static std::string ToString();
- static void InitializeDecoder(DecoderType* decoder,
- DemuxerStream* stream,
- const PipelineStatusCB& status_cb,
- const OutputCB& output_cb);
+ static void InitializeDecoder(
+ DecoderType* decoder,
+ DemuxerStream* stream,
+ const PipelineStatusCB& status_cb,
+ const OutputCB& output_cb,
+ const base::Closure& waiting_for_encryption_key_cb);
static bool NeedsBitstreamConversion(DecoderType* decoder) { return false; }
static void ReportStatistics(const StatisticsCB& statistics_cb,
int bytes_decoded);
@@ -49,10 +51,12 @@ struct DecoderStreamTraits<DemuxerStream::VIDEO> {
typedef base::Callback<void(const scoped_refptr<OutputType>&)> OutputCB;
static std::string ToString();
- static void InitializeDecoder(DecoderType* decoder,
- DemuxerStream* stream,
- const PipelineStatusCB& status_cb,
- const OutputCB& output_cb);
+ static void InitializeDecoder(
+ DecoderType* decoder,
+ DemuxerStream* stream,
+ const PipelineStatusCB& status_cb,
+ const OutputCB& output_cb,
+ const base::Closure& waiting_for_encryption_key_cb);
static bool NeedsBitstreamConversion(DecoderType* decoder);
static void ReportStatistics(const StatisticsCB& statistics_cb,
int bytes_decoded);

Powered by Google App Engine
This is Rietveld 408576698