summaryrefslogtreecommitdiffstats
path: root/media/media.gyp
diff options
context:
space:
mode:
authoracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-05 01:53:20 +0000
committeracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-05 01:53:20 +0000
commit34d4ebbfd10b704f4f9be87a74e2e072c4dec081 (patch)
tree59cf1715cbe022475b2f77d12f9846e4e45c187c /media/media.gyp
parent191bdfbf8c537a203aa1f6dc439a934b3e917fa4 (diff)
downloadchromium_src-34d4ebbfd10b704f4f9be87a74e2e072c4dec081.zip
chromium_src-34d4ebbfd10b704f4f9be87a74e2e072c4dec081.tar.gz
chromium_src-34d4ebbfd10b704f4f9be87a74e2e072c4dec081.tar.bz2
Revert 140453 - Reorganize so that ChunkDemuxerStreams create and own SourceBufferStreams.
Reverting because it breaks LayoutTests http/tests/media/media-source/video-media-source-add-and-remove-ids.html http/tests/media/media-source/video-media-source-seek.html This patch moves SourceBufferStream into ChunkDemuxerStream and removes SourceBuffer altogether. ChunkDemuxer now manages a StreamParser and passes data along to ChunkDemuxerStreams when new data is parsed. BUG=130876 TEST=ChunkDemuxerTest.* Review URL: https://chromiumcodereview.appspot.com/10505009 TBR=annacc@chromium.org Review URL: https://chromiumcodereview.appspot.com/10483023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140469 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
-rw-r--r--media/media.gyp2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp
index f1ac284..8c5a3b7 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -226,6 +226,8 @@
'filters/gpu_video_decoder.h',
'filters/in_memory_url_protocol.cc',
'filters/in_memory_url_protocol.h',
+ 'filters/source_buffer.cc',
+ 'filters/source_buffer.h',
'filters/source_buffer_stream.cc',
'filters/source_buffer_stream.h',
'filters/video_frame_generator.cc',