| Index: media/base/pipeline.h
|
| diff --git a/media/base/pipeline.h b/media/base/pipeline.h
|
| index 12371b4e3b511e7233cbfe5746b2110d7a9684a8..a8297539f6e891a148f42a7629e63cc70506a0c6 100644
|
| --- a/media/base/pipeline.h
|
| +++ b/media/base/pipeline.h
|
| @@ -12,6 +12,7 @@
|
| #include "base/synchronization/lock.h"
|
| #include "base/threading/thread_checker.h"
|
| #include "media/base/audio_renderer.h"
|
| +#include "media/base/decryptor.h"
|
| #include "media/base/demuxer.h"
|
| #include "media/base/media_export.h"
|
| #include "media/base/pipeline_status.h"
|
| @@ -129,11 +130,13 @@ class MEDIA_EXPORT Pipeline
|
| // |buffering_state_cb| Optional callback that will be executed whenever the
|
| // pipeline's buffering state changes.
|
| // It is an error to call this method after the pipeline has already started.
|
| - void Start(scoped_ptr<FilterCollection> filter_collection,
|
| - const PipelineStatusCB& ended_cb,
|
| - const PipelineStatusCB& error_cb,
|
| - const PipelineStatusCB& seek_cb,
|
| - const BufferingStateCB& buffering_state_cb);
|
| + void Start(
|
| + scoped_ptr<FilterCollection> filter_collection,
|
| + const PipelineStatusCB& ended_cb,
|
| + const PipelineStatusCB& error_cb,
|
| + const PipelineStatusCB& seek_cb,
|
| + const BufferingStateCB& buffering_state_cb,
|
| + const RequestDecryptorNotificationCB& request_decryptor_notification_cb);
|
|
|
| // Asynchronously stops the pipeline, executing |stop_cb| when the pipeline
|
| // teardown has completed.
|
| @@ -288,11 +291,13 @@ class MEDIA_EXPORT Pipeline
|
| // The following "task" methods correspond to the public methods, but these
|
| // methods are run as the result of posting a task to the PipelineInternal's
|
| // message loop.
|
| - void StartTask(scoped_ptr<FilterCollection> filter_collection,
|
| - const PipelineStatusCB& ended_cb,
|
| - const PipelineStatusCB& error_cb,
|
| - const PipelineStatusCB& seek_cb,
|
| - const BufferingStateCB& buffering_state_cb);
|
| + void StartTask(
|
| + scoped_ptr<FilterCollection> filter_collection,
|
| + const PipelineStatusCB& ended_cb,
|
| + const PipelineStatusCB& error_cb,
|
| + const PipelineStatusCB& seek_cb,
|
| + const BufferingStateCB& buffering_state_cb,
|
| + const RequestDecryptorNotificationCB& request_decryptor_notification_cb);
|
|
|
| // Stops and destroys all filters, placing the pipeline in the kStopped state.
|
| void StopTask(const base::Closure& stop_cb);
|
| @@ -448,6 +453,7 @@ class MEDIA_EXPORT Pipeline
|
| PipelineStatusCB ended_cb_;
|
| PipelineStatusCB error_cb_;
|
| BufferingStateCB buffering_state_cb_;
|
| + RequestDecryptorNotificationCB request_decryptor_notification_cb_;
|
|
|
| // Renderer references used for setting the volume, playback rate, and
|
| // determining when playback has finished.
|
|
|