summaryrefslogtreecommitdiffstats
path: root/media/BUILD.gn
diff options
context:
space:
mode:
authorjrummell <jrummell@chromium.org>2016-02-17 13:37:55 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-17 21:40:15 +0000
commit550e1c056d4456000cb4be88676d6f5f01b9efdb (patch)
tree57c7148baf6f139b71fb56e0dbacd11fde2ad2ac /media/BUILD.gn
parenta07ac351c9bab9b617d617955e295b59c29941f6 (diff)
downloadchromium_src-550e1c056d4456000cb4be88676d6f5f01b9efdb.zip
chromium_src-550e1c056d4456000cb4be88676d6f5f01b9efdb.tar.gz
chromium_src-550e1c056d4456000cb4be88676d6f5f01b9efdb.tar.bz2
Add allocator interface for use by cdm_adapter
Rather than allocating a buffer directly, add CdmAllocator interface that will allocate buffers as needed. Initial implementation of CdmAllocator (SimpleCdmAllocator) simply creates a new buffer every time one is needed. There is no reuse, since it will only be used for testing purposes. CdmAllocator also has an interface to create a cdm::VideoFrame, which now has the additional ability to create a media::VideoFrame using the data returned by the CDM. BUG=510088 TEST=Updated tests pass Review URL: https://codereview.chromium.org/1673383002 Cr-Commit-Position: refs/heads/master@{#375987}
Diffstat (limited to 'media/BUILD.gn')
-rw-r--r--media/BUILD.gn9
1 files changed, 7 insertions, 2 deletions
diff --git a/media/BUILD.gn b/media/BUILD.gn
index af43a8f..b92755a 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -175,8 +175,8 @@ component("media") {
"cdm/aes_decryptor.h",
"cdm/cdm_adapter.cc",
"cdm/cdm_adapter.h",
- "cdm/cdm_buffer_impl.cc",
- "cdm/cdm_buffer_impl.h",
+ "cdm/cdm_allocator.cc",
+ "cdm/cdm_allocator.h",
"cdm/cdm_helpers.cc",
"cdm/cdm_helpers.h",
"cdm/default_cdm_factory.cc",
@@ -635,6 +635,11 @@ test("media_unittests") {
"cdm/external_clear_key_test_helper.cc",
"cdm/external_clear_key_test_helper.h",
"cdm/json_web_key_unittest.cc",
+ "cdm/simple_cdm_allocator.cc",
+ "cdm/simple_cdm_allocator.h",
+ "cdm/simple_cdm_allocator_unittest.cc",
+ "cdm/simple_cdm_buffer.cc",
+ "cdm/simple_cdm_buffer.h",
"filters/audio_clock_unittest.cc",
"filters/audio_decoder_selector_unittest.cc",
"filters/audio_renderer_algorithm_unittest.cc",