Index: media/base/pipeline.cc |
diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc |
index e9c52d66cb9a5da388008cb7a9e24396824d7502..54e0e4de5f2c2656ef0add66e3012224cd96d9d8 100644 |
--- a/media/base/pipeline.cc |
+++ b/media/base/pipeline.cc |
@@ -70,7 +70,8 @@ void Pipeline::Start(Demuxer* demuxer, |
const BufferingStateCB& buffering_state_cb, |
const PaintCB& paint_cb, |
const base::Closure& duration_change_cb, |
- const AddTextTrackCB& add_text_track_cb) { |
+ const AddTextTrackCB& add_text_track_cb, |
+ const base::Closure& waiting_for_encryption_key_cb) { |
DCHECK(!ended_cb.is_null()); |
DCHECK(!error_cb.is_null()); |
DCHECK(!seek_cb.is_null()); |
@@ -92,6 +93,7 @@ void Pipeline::Start(Demuxer* demuxer, |
paint_cb_ = paint_cb; |
duration_change_cb_ = duration_change_cb; |
add_text_track_cb_ = add_text_track_cb; |
+ waiting_for_encryption_key_cb_ = waiting_for_encryption_key_cb; |
task_runner_->PostTask( |
FROM_HERE, base::Bind(&Pipeline::StartTask, weak_factory_.GetWeakPtr())); |
@@ -717,14 +719,13 @@ void Pipeline::InitializeRenderer(const PipelineStatusCB& done_cb) { |
} |
base::WeakPtr<Pipeline> weak_this = weak_factory_.GetWeakPtr(); |
- renderer_->Initialize( |
- demuxer_, |
- done_cb, |
- base::Bind(&Pipeline::OnUpdateStatistics, weak_this), |
- base::Bind(&Pipeline::BufferingStateChanged, weak_this), |
- base::ResetAndReturn(&paint_cb_), |
- base::Bind(&Pipeline::OnRendererEnded, weak_this), |
- base::Bind(&Pipeline::OnError, weak_this)); |
+ renderer_->Initialize(demuxer_, done_cb, |
+ base::Bind(&Pipeline::OnUpdateStatistics, weak_this), |
+ base::Bind(&Pipeline::BufferingStateChanged, weak_this), |
+ base::ResetAndReturn(&paint_cb_), |
+ base::Bind(&Pipeline::OnRendererEnded, weak_this), |
+ base::Bind(&Pipeline::OnError, weak_this), |
+ waiting_for_encryption_key_cb_); |
} |
void Pipeline::ReportMetadata() { |