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

Unified Diff: media/base/pipeline.h

Issue 11492003: Encrypted Media: Support Audio Decrypt-Only. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments mostly resolved (I believe); need to add/update tests if this looks good Created 8 years 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/base/pipeline.h
diff --git a/media/base/pipeline.h b/media/base/pipeline.h
index 12371b4e3b511e7233cbfe5746b2110d7a9684a8..f504f270a8a43be415182a54aa07e0d77ea33fa6 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"
@@ -133,7 +134,8 @@ class MEDIA_EXPORT Pipeline
const PipelineStatusCB& ended_cb,
const PipelineStatusCB& error_cb,
const PipelineStatusCB& seek_cb,
- const BufferingStateCB& buffering_state_cb);
+ const BufferingStateCB& buffering_state_cb,
+ const SetDecryptorReadyCB& set_decryptor_ready_cb);
// Asynchronously stops the pipeline, executing |stop_cb| when the pipeline
// teardown has completed.
@@ -292,7 +294,8 @@ class MEDIA_EXPORT Pipeline
const PipelineStatusCB& ended_cb,
const PipelineStatusCB& error_cb,
const PipelineStatusCB& seek_cb,
- const BufferingStateCB& buffering_state_cb);
+ const BufferingStateCB& buffering_state_cb,
+ const SetDecryptorReadyCB& set_decryptor_ready_cb);
// Stops and destroys all filters, placing the pipeline in the kStopped state.
void StopTask(const base::Closure& stop_cb);
@@ -448,6 +451,7 @@ class MEDIA_EXPORT Pipeline
PipelineStatusCB ended_cb_;
PipelineStatusCB error_cb_;
BufferingStateCB buffering_state_cb_;
+ SetDecryptorReadyCB set_decryptor_ready_cb_;
// Renderer references used for setting the volume, playback rate, and
// determining when playback has finished.

Powered by Google App Engine
This is Rietveld 408576698