| Index: media/base/stream_parser.h
|
| diff --git a/media/base/stream_parser.h b/media/base/stream_parser.h
|
| index 690b1c471979ba3168b009bbd005d605dd6cfde4..efa3af813587842df89d53601f334aed1762d8a9 100644
|
| --- a/media/base/stream_parser.h
|
| +++ b/media/base/stream_parser.h
|
| @@ -107,8 +107,8 @@ class MEDIA_EXPORT StreamParser {
|
| // First parameter - The type of the initialization data associated with the
|
| // stream.
|
| // Second parameter - The initialization data associated with the stream.
|
| - typedef base::Callback<void(const std::string&,
|
| - const std::vector<uint8>&)> NeedKeyCB;
|
| + typedef base::Callback<void(const std::string&, const std::vector<uint8>&)>
|
| + EncryptedMediaInitDataCB;
|
|
|
| StreamParser();
|
| virtual ~StreamParser();
|
| @@ -118,14 +118,15 @@ class MEDIA_EXPORT StreamParser {
|
| // been parsed to determine the initial stream configurations, presentation
|
| // start time, and duration. If |ignore_text_track| is true, then no text
|
| // buffers should be passed later by the parser to |new_buffers_cb|.
|
| - virtual void Init(const InitCB& init_cb,
|
| - const NewConfigCB& config_cb,
|
| - const NewBuffersCB& new_buffers_cb,
|
| - bool ignore_text_track,
|
| - const NeedKeyCB& need_key_cb,
|
| - const NewMediaSegmentCB& new_segment_cb,
|
| - const base::Closure& end_of_segment_cb,
|
| - const LogCB& log_cb) = 0;
|
| + virtual void Init(
|
| + const InitCB& init_cb,
|
| + const NewConfigCB& config_cb,
|
| + const NewBuffersCB& new_buffers_cb,
|
| + bool ignore_text_track,
|
| + const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
|
| + const NewMediaSegmentCB& new_segment_cb,
|
| + const base::Closure& end_of_segment_cb,
|
| + const LogCB& log_cb) = 0;
|
|
|
| // Called when a seek occurs. This flushes the current parser state
|
| // and puts the parser in a state where it can receive data for the new seek
|
|
|