media/media.gyp - Issue 7203002: Adding ChunkDemuxer implementation.

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 7203002: Adding ChunkDemuxer implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed CR comments & split code out into separate files. 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 87f9077163762c38d0509df2ee2f7ff8af3985ec..04d47f258ec88abd030506a6eb293dc719b06c0a 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,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': [

« media/filters/chunk_demuxer.cc ('K') | « media/filters/in_memory_url_protocol.cc ('k') | media/webm/webm_cluster_parser.h » ('j') | media/webm/webm_cluster_parser.h » ('J')