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

Unified Diff: media/media.gyp

Issue 10969028: Add video decoding methods in Decryptor and add DecryptingVideoDecoder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reorder methods in the unittest Created 8 years, 2 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
« no previous file with comments | « media/filters/ffmpeg_video_decoder.cc ('k') | webkit/media/crypto/ppapi_decryptor.h » ('j') | no next file with comments »
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 d1a74a0e303638645c777af1c66145d8cbe5e101..e7ca958fbb26845d7815a1af7daf03219d7782e5 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -183,6 +183,7 @@
'base/data_source.h',
'base/decoder_buffer.cc',
'base/decoder_buffer.h',
+ 'base/decryptor.cc',
'base/decryptor.h',
'base/decryptor_client.h',
'base/decrypt_config.cc',
@@ -249,6 +250,8 @@
'filters/audio_renderer_impl.h',
'filters/chunk_demuxer.cc',
'filters/chunk_demuxer.h',
+ 'filters/decrypting_video_decoder.cc',
+ 'filters/decrypting_video_decoder.h',
'filters/dummy_demuxer.cc',
'filters/dummy_demuxer.h',
'filters/ffmpeg_audio_decoder.cc',
@@ -633,6 +636,7 @@
'filters/audio_renderer_algorithm_unittest.cc',
'filters/audio_renderer_impl_unittest.cc',
'filters/chunk_demuxer_unittest.cc',
+ 'filters/decrypting_video_decoder_unittest.cc',
'filters/ffmpeg_audio_decoder_unittest.cc',
'filters/ffmpeg_decoder_unittest.h',
'filters/ffmpeg_demuxer_unittest.cc',
« no previous file with comments | « media/filters/ffmpeg_video_decoder.cc ('k') | webkit/media/crypto/ppapi_decryptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698