media/media.gyp - Issue 10969028: Add video decoding methods in Decryptor and add DecryptingVideoDecoder.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: resolve comments and fix stop-during-pending-init. 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

Index: media/media.gyp

diff --git a/media/media.gyp b/media/media.gyp

index 02d9ca5e203a8440cdbb7111f785dee2934ed9a0..4b333461470a69747752bf5f5006a9a6c2e1dff0 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',

@@ -628,6 +631,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',

« media/filters/decrypting_video_decoder.cc ('K') | « media/filters/ffmpeg_video_decoder.cc ('k') | webkit/media/crypto/ppapi_decryptor.h » ('j') | no next file with comments »