diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-09 15:58:16 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-09 15:58:16 +0000 |
| commit | cee323423df2894048258daa02e2b1c3c24e7c46 (patch) | |
| tree | 88b6b5da7c1b92daae8c1ff206d2f3c7399814f3 /webkit | |
| parent | 4b571e6b3efa2f510f64de4718a1f37a9542a251 (diff) | |
| download | chromium_src-cee323423df2894048258daa02e2b1c3c24e7c46.zip chromium_src-cee323423df2894048258daa02e2b1c3c24e7c46.tar.gz chromium_src-cee323423df2894048258daa02e2b1c3c24e7c46.tar.bz2 | |
Remove the silly notion of MIME types from media code.
This was one of the first things I checked into Chromium and I've been wanting to remove it for a long, long time now.
BUG=28206
TEST=media_unittests
Review URL: http://codereview.chromium.org/6623087
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77468 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/media/buffered_data_source.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/media/simple_data_source.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/webmediaplayer_impl.cc | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/webkit/glue/media/buffered_data_source.cc b/webkit/glue/media/buffered_data_source.cc index 7902221..9cb0284 100644 --- a/webkit/glue/media/buffered_data_source.cc +++ b/webkit/glue/media/buffered_data_source.cc @@ -92,8 +92,6 @@ void BufferedDataSource::Initialize(const std::string& url, DCHECK(callback); initialize_callback_.reset(callback); - media_format_.SetAsString(media::MediaFormat::kMimeType, - media::mime_type::kApplicationOctetStream); media_format_.SetAsString(media::MediaFormat::kURL, url); // Post a task to complete the initialization task. diff --git a/webkit/glue/media/simple_data_source.cc b/webkit/glue/media/simple_data_source.cc index 5c3eb18..f1564d9 100644 --- a/webkit/glue/media/simple_data_source.cc +++ b/webkit/glue/media/simple_data_source.cc @@ -210,8 +210,6 @@ void SimpleDataSource::Abort() { void SimpleDataSource::SetURL(const GURL& url) { url_ = url; media_format_.Clear(); - media_format_.SetAsString(media::MediaFormat::kMimeType, - media::mime_type::kApplicationOctetStream); media_format_.SetAsString(media::MediaFormat::kURL, url.spec()); } diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc index eda79f5..3801406 100644 --- a/webkit/glue/webmediaplayer_impl.cc +++ b/webkit/glue/webmediaplayer_impl.cc @@ -481,13 +481,13 @@ bool WebMediaPlayerImpl::totalBytesKnown() { bool WebMediaPlayerImpl::hasVideo() const { DCHECK(MessageLoop::current() == main_loop_); - return pipeline_->IsRendered(media::mime_type::kMajorTypeVideo); + return pipeline_->HasVideo(); } bool WebMediaPlayerImpl::hasAudio() const { DCHECK(MessageLoop::current() == main_loop_); - return pipeline_->IsRendered(media::mime_type::kMajorTypeAudio); + return pipeline_->HasAudio(); } WebKit::WebSize WebMediaPlayerImpl::naturalSize() const { |