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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/media.gyp

Issue 10535029: Add support for encrypted WebM files as defined in the RFC. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: –Fix DecodeEncryptedFrame_WrongKey test. Created 8 years, 6 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
« media/filters/pipeline_integration_test.cc ('K') | « media/filters/pipeline_integration_test_base.cc ('k') | media/test/data/bear-320x240-encrypted.webm » ('j') | media/webm/webm_parser.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 2a8c6c6aeb406f6311413654c5399cedff34b408..a750f184f1cd1338f10540c99e7f7a1c263412a6 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -196,6 +196,10 @@
'base/video_util.h',
'crypto/aes_decryptor.cc',
'crypto/aes_decryptor.h',
+ 'crypto/decryptor.cc',
+ 'crypto/decryptor.h',
+ 'crypto/hmac_aes_decryptor.cc',
+ 'crypto/hmac_aes_decryptor.h',
'ffmpeg/ffmpeg_common.cc',
'ffmpeg/ffmpeg_common.h',
'ffmpeg/file_protocol.cc',
@@ -682,6 +686,7 @@
'base/video_util_unittest.cc',
'base/yuv_convert_unittest.cc',
'crypto/aes_decryptor_unittest.cc',
+ 'crypto/hmac_aes_decryptor_unittest.cc',
'ffmpeg/ffmpeg_common_unittest.cc',
'filters/audio_renderer_algorithm_unittest.cc',
'filters/audio_renderer_impl_unittest.cc',
« media/filters/pipeline_integration_test.cc ('K') | « media/filters/pipeline_integration_test_base.cc ('k') | media/test/data/bear-320x240-encrypted.webm » ('j') | media/webm/webm_parser.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698