diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-22 21:37:17 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-22 21:37:17 +0000 |
| commit | 8e296bbd2d147c270d1839ab9dd93418532322e5 (patch) | |
| tree | 250887882d757ad020aba85af7db935c4107a105 /chrome/renderer/render_view.cc | |
| parent | 944a14b8d46e63e603850c6c8b0d0638dc492a14 (diff) | |
| download | chromium_src-8e296bbd2d147c270d1839ab9dd93418532322e5.zip chromium_src-8e296bbd2d147c270d1839ab9dd93418532322e5.tar.gz chromium_src-8e296bbd2d147c270d1839ab9dd93418532322e5.tar.bz2 | |
Changes to provide asynchronous read in data source:
1. FFmpegGlue now taks a FFmpegProtocol instead of DataSource as input
2. FFmpegDemuxr implements FFmpegProtocol and does the blocking read and submit asynchronous read request to DataSource (with unit tests)
3. Changed SimpleDataSource to work with asynchronous read (with unit tests)
4. Reimplemented BufferedDataSource to work with asynchronous read (with unit tests)
5. Moved BufferedDataSource from chrome/renderer/media to webkit/glue/media (for faster build/debug and better coverage in automated testing)
TEST=BufferedDataSourceTest.*, SimpleDataSourceTest.*, FFmpegDemuxerTest.*
Review URL: http://codereview.chromium.org/149567
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21326 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/render_view.cc')
| -rw-r--r-- | chrome/renderer/render_view.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 34a415f..21c40e2 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -41,7 +41,6 @@ #include "chrome/renderer/extensions/renderer_extension_bindings.h" #include "chrome/renderer/localized_error.h" #include "chrome/renderer/media/audio_renderer_impl.h" -#include "chrome/renderer/media/buffered_data_source.h" #include "chrome/renderer/navigation_state.h" #include "chrome/renderer/print_web_view_helper.h" #include "chrome/renderer/render_process.h" @@ -74,6 +73,7 @@ #include "webkit/glue/dom_operations.h" #include "webkit/glue/dom_serializer.h" #include "webkit/glue/image_decoder.h" +#include "webkit/glue/media/buffered_data_source.h" #include "webkit/glue/media/simple_data_source.h" #include "webkit/glue/password_form.h" #include "webkit/glue/plugins/plugin_list.h" @@ -1859,8 +1859,8 @@ WebKit::WebMediaPlayer* RenderView::CreateWebMediaPlayer( if (!cmd_line->HasSwitch(switches::kSimpleDataSource)) { // Add the chrome specific media data source. factory->AddFactory( - BufferedDataSource::CreateFactory(MessageLoop::current(), - bridge_factory)); + webkit_glue::BufferedDataSource::CreateFactory(MessageLoop::current(), + bridge_factory)); } else { factory->AddFactory( webkit_glue::SimpleDataSource::CreateFactory(MessageLoop::current(), |