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

Unified Diff: media/media.gyp

Issue 7203002: Adding ChunkDemuxer implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Unit tests and bug fixes Created 9 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
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 1bac8c01e7402a23ab6d8f133bc8318217774d80..d885726fc178043a9aba5243dfe7cac65841b222 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -150,11 +150,17 @@
'filters/audio_renderer_impl.h',
'filters/bitstream_converter.cc',
'filters/bitstream_converter.h',
+ 'filters/chunk_demuxer.cc',
+ 'filters/chunk_demuxer.h',
+ 'filters/chunk_demuxer_factory.cc',
+ 'filters/chunk_demuxer_factory.h',
'filters/decoder_base.h',
'filters/ffmpeg_audio_decoder.cc',
'filters/ffmpeg_audio_decoder.h',
'filters/ffmpeg_demuxer.cc',
'filters/ffmpeg_demuxer.h',
+ 'filters/ffmpeg_demuxer_factory.cc',
+ 'filters/ffmpeg_demuxer_factory.h',
'filters/ffmpeg_h264_bitstream_converter.cc',
'filters/ffmpeg_h264_bitstream_converter.h',
'filters/ffmpeg_glue.cc',
@@ -163,10 +169,10 @@
'filters/ffmpeg_video_decoder.h',
'filters/file_data_source.cc',
'filters/file_data_source.h',
- 'filters/ffmpeg_demuxer_factory.cc',
- 'filters/ffmpeg_demuxer_factory.h',
'filters/file_data_source_factory.cc',
'filters/file_data_source_factory.h',
+ 'filters/in_memory_url_protocol.cc',
+ 'filters/in_memory_url_protocol.h',
'filters/null_audio_renderer.cc',
'filters/null_audio_renderer.h',
'filters/null_video_renderer.cc',
@@ -191,6 +197,17 @@
'video/video_decode_accelerator.cc',
'video/video_decode_accelerator.h',
'video/video_decode_engine.h',
+ 'webm/cluster_builder.cc',
scherkus (not reviewing) 2011/06/28 20:03:29 these two files should be part of media_unittests
acolwell GONE FROM CHROMIUM 2011/06/29 16:38:43 Done.
+ 'webm/cluster_builder.h',
+ 'webm/webm_constants.h',
+ 'webm/webm_cluster_parser.cc',
+ 'webm/webm_cluster_parser.h',
+ 'webm/webm_info_parser.cc',
+ 'webm/webm_info_parser.h',
+ 'webm/webm_parser.cc',
+ 'webm/webm_parser.h',
+ 'webm/webm_tracks_parser.cc',
+ 'webm/webm_tracks_parser.h',
],
'direct_dependent_settings': {
'include_dirs': [
@@ -413,6 +430,7 @@
'filters/audio_renderer_algorithm_ola_unittest.cc',
'filters/audio_renderer_base_unittest.cc',
'filters/bitstream_converter_unittest.cc',
+ 'filters/chunk_demuxer_unittest.cc',
'filters/decoder_base_unittest.cc',
'filters/ffmpeg_demuxer_unittest.cc',
'filters/ffmpeg_glue_unittest.cc',

Powered by Google App Engine
This is Rietveld 408576698