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

Side by Side 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 unified diff | Download patch
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_STREAM_TRAITS_H_ 5 #ifndef MEDIA_FILTERS_DECODER_STREAM_TRAITS_H_
6 #define MEDIA_FILTERS_DECODER_STREAM_TRAITS_H_ 6 #define MEDIA_FILTERS_DECODER_STREAM_TRAITS_H_
7 7
8 #include "media/base/demuxer_stream.h" 8 #include "media/base/demuxer_stream.h"
9 #include "media/base/pipeline_status.h" 9 #include "media/base/pipeline_status.h"
10 10
(...skipping 12 matching lines...) Expand all
23 23
24 template <> 24 template <>
25 struct DecoderStreamTraits<DemuxerStream::AUDIO> { 25 struct DecoderStreamTraits<DemuxerStream::AUDIO> {
26 typedef AudioBuffer OutputType; 26 typedef AudioBuffer OutputType;
27 typedef AudioDecoder DecoderType; 27 typedef AudioDecoder DecoderType;
28 typedef DecryptingAudioDecoder DecryptingDecoderType; 28 typedef DecryptingAudioDecoder DecryptingDecoderType;
29 typedef base::Callback<void(bool success)> StreamInitCB; 29 typedef base::Callback<void(bool success)> StreamInitCB;
30 typedef base::Callback<void(const scoped_refptr<OutputType>&)> OutputCB; 30 typedef base::Callback<void(const scoped_refptr<OutputType>&)> OutputCB;
31 31
32 static std::string ToString(); 32 static std::string ToString();
33 static void InitializeDecoder(DecoderType* decoder, 33 static void InitializeDecoder(
34 DemuxerStream* stream, 34 DecoderType* decoder,
35 const PipelineStatusCB& status_cb, 35 DemuxerStream* stream,
36 const OutputCB& output_cb); 36 const PipelineStatusCB& status_cb,
37 const OutputCB& output_cb,
38 const base::Closure& waiting_for_encryption_key_cb);
37 static bool NeedsBitstreamConversion(DecoderType* decoder) { return false; } 39 static bool NeedsBitstreamConversion(DecoderType* decoder) { return false; }
38 static void ReportStatistics(const StatisticsCB& statistics_cb, 40 static void ReportStatistics(const StatisticsCB& statistics_cb,
39 int bytes_decoded); 41 int bytes_decoded);
40 static scoped_refptr<OutputType> CreateEOSOutput(); 42 static scoped_refptr<OutputType> CreateEOSOutput();
41 }; 43 };
42 44
43 template <> 45 template <>
44 struct DecoderStreamTraits<DemuxerStream::VIDEO> { 46 struct DecoderStreamTraits<DemuxerStream::VIDEO> {
45 typedef VideoFrame OutputType; 47 typedef VideoFrame OutputType;
46 typedef VideoDecoder DecoderType; 48 typedef VideoDecoder DecoderType;
47 typedef DecryptingVideoDecoder DecryptingDecoderType; 49 typedef DecryptingVideoDecoder DecryptingDecoderType;
48 typedef base::Callback<void(bool success)> StreamInitCB; 50 typedef base::Callback<void(bool success)> StreamInitCB;
49 typedef base::Callback<void(const scoped_refptr<OutputType>&)> OutputCB; 51 typedef base::Callback<void(const scoped_refptr<OutputType>&)> OutputCB;
50 52
51 static std::string ToString(); 53 static std::string ToString();
52 static void InitializeDecoder(DecoderType* decoder, 54 static void InitializeDecoder(
53 DemuxerStream* stream, 55 DecoderType* decoder,
54 const PipelineStatusCB& status_cb, 56 DemuxerStream* stream,
55 const OutputCB& output_cb); 57 const PipelineStatusCB& status_cb,
58 const OutputCB& output_cb,
59 const base::Closure& waiting_for_encryption_key_cb);
56 static bool NeedsBitstreamConversion(DecoderType* decoder); 60 static bool NeedsBitstreamConversion(DecoderType* decoder);
57 static void ReportStatistics(const StatisticsCB& statistics_cb, 61 static void ReportStatistics(const StatisticsCB& statistics_cb,
58 int bytes_decoded); 62 int bytes_decoded);
59 static scoped_refptr<OutputType> CreateEOSOutput(); 63 static scoped_refptr<OutputType> CreateEOSOutput();
60 }; 64 };
61 65
62 } // namespace media 66 } // namespace media
63 67
64 #endif // MEDIA_FILTERS_DECODER_STREAM_TRAITS_H_ 68 #endif // MEDIA_FILTERS_DECODER_STREAM_TRAITS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698