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

Unified Diff: media/media.gyp

Issue 7203002: Adding ChunkDemuxer implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed unit tests and nits 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
« no previous file with comments | « media/filters/in_memory_url_protocol.cc ('k') | media/test/data/webm_info_element » ('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 5356f2af9ac8d750bd1c85cff822969de9c50cf4..07a622ef57c8e11687560b6757f7b1eb63e782cf 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -151,11 +151,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',
@@ -164,10 +170,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',
@@ -192,6 +198,15 @@
'video/video_decode_accelerator.cc',
'video/video_decode_accelerator.h',
'video/video_decode_engine.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': [
@@ -401,6 +416,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',
@@ -410,6 +426,8 @@
'filters/rtc_video_decoder_unittest.cc',
'filters/video_renderer_base_unittest.cc',
'video/ffmpeg_video_decode_engine_unittest.cc',
+ 'webm/cluster_builder.cc',
+ 'webm/cluster_builder.h',
],
'conditions': [
['os_posix==1 and OS!="mac"', {
« no previous file with comments | « media/filters/in_memory_url_protocol.cc ('k') | media/test/data/webm_info_element » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698