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

Unified Diff: media/cdm/cdm_adapter.h

Issue 1673383002: Add allocator interface for use by cdm_adapter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
Index: media/cdm/cdm_adapter.h
diff --git a/media/cdm/cdm_adapter.h b/media/cdm/cdm_adapter.h
index 091d77595bd77f09baa946b357555d399cce7f4d..a3b4a47d045e774c40328b9f972360402f573c73 100644
--- a/media/cdm/cdm_adapter.h
+++ b/media/cdm/cdm_adapter.h
@@ -31,6 +31,7 @@
namespace media {
class AudioFramesImpl;
+class CdmBufferAllocator;
class CdmWrapper;
class MEDIA_EXPORT CdmAdapter : public MediaKeys,
@@ -51,7 +52,8 @@ class MEDIA_EXPORT CdmAdapter : public MediaKeys,
const LegacySessionErrorCB& legacy_session_error_cb,
const SessionKeysChangeCB& session_keys_change_cb,
const SessionExpirationUpdateCB& session_expiration_update_cb,
- const CdmCreatedCB& cdm_created_cb);
+ const CdmCreatedCB& cdm_created_cb,
+ CdmBufferAllocator* allocator);
// MediaKeys implementation.
void SetServerCertificate(const std::vector<uint8_t>& certificate,
@@ -148,7 +150,8 @@ class MEDIA_EXPORT CdmAdapter : public MediaKeys,
const SessionClosedCB& session_closed_cb,
const LegacySessionErrorCB& legacy_session_error_cb,
const SessionKeysChangeCB& session_keys_change_cb,
- const SessionExpirationUpdateCB& session_expiration_update_cb);
+ const SessionExpirationUpdateCB& session_expiration_update_cb,
+ CdmBufferAllocator* allocator);
~CdmAdapter() final;
// Load the CDM using |cdm_path| and initialize it. |promise| is resolved if
@@ -204,6 +207,8 @@ class MEDIA_EXPORT CdmAdapter : public MediaKeys,
int audio_samples_per_second_;
ChannelLayout audio_channel_layout_;
+ CdmBufferAllocator* allocator_;
+
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
// NOTE: Weak pointers must be invalidated before all other member variables.

Powered by Google App Engine
This is Rietveld 408576698