Remove MediaFormat once and for all.

BUG=28206
TEST=media_unittests, unit_tests, layout_tests

Review URL: http://codereview.chromium.org/7452016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93282 0039d316-1c4b-4281-b951-d872f2087c98

22 files changed, 6 insertions, 240 deletions

diff --git a/content/renderer/media/rtc_video_decoder_unittest.cc b/content/renderer/media/rtc_video_decoder_unittest.cc
index efe67ed..0018b52 100644
--- a/content/renderer/media/rtc_video_decoder_unittest.cc
+++ b/content/renderer/media/rtc_video_decoder_unittest.cc
@@ -29,7 +29,6 @@ using ::testing::StrictMock;
 using ::testing::WithArg;
 using ::testing::Invoke;
 using media::Limits;
-using media::MediaFormat;
 using media::MockStatisticsCallback;
 using media::MockVideoRenderer;
 using media::MockFilterHost;
diff --git a/media/base/composite_filter.h b/media/base/composite_filter.h
index 82a0791..38d52c8 100644
--- a/media/base/composite_filter.h
+++ b/media/base/composite_filter.h
@@ -5,6 +5,8 @@
 #ifndef MEDIA_BASE_COMPOSITE_FILTER_H_
 #define MEDIA_BASE_COMPOSITE_FILTER_H_
 
+#include <vector>
+
 #include "base/task.h"
 #include "media/base/filter_host.h"
 #include "media/base/filters.h"
diff --git a/media/base/filters.h b/media/base/filters.h
index ffd7201..f9b162c 100644
--- a/media/base/filters.h
+++ b/media/base/filters.h
@@ -32,7 +32,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "media/base/audio_decoder_config.h"
-#include "media/base/media_format.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/video_frame.h"
 
@@ -177,9 +176,6 @@ class DemuxerStream : public base::RefCountedThreadSafe<DemuxerStream> {
   // Returns the type of stream.
   virtual Type type() = 0;
 
-  // Returns the media format of this stream.
-  virtual const MediaFormat& media_format() = 0;
-
   virtual void EnableBitstreamConverter() = 0;
 
  protected:
diff --git a/media/base/media_format.cc b/media/base/media_format.cc
deleted file mode 100644
index 242cfef..0000000
--- a/media/base/media_format.cc
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "media/base/media_format.h"
-
-namespace media {
-
-const char MediaFormat::kURL[]              = "URL";
-const char MediaFormat::kSurfaceFormat[]    = "SurfaceFormat";
-const char MediaFormat::kSurfaceType[]      = "SurfaceType";
-const char MediaFormat::kSampleRate[]       = "SampleRate";
-const char MediaFormat::kSampleBits[]       = "SampleBits";
-const char MediaFormat::kChannels[]         = "Channels";
-const char MediaFormat::kWidth[]            = "Width";
-const char MediaFormat::kHeight[]           = "Height";
-
-MediaFormat::MediaFormat() {}
-
-MediaFormat::~MediaFormat() {
-  Clear();
-}
-
-bool MediaFormat::Contains(const std::string& key) const {
-  return value_map_.find(key) != value_map_.end();
-}
-
-void MediaFormat::Clear() {
-  for (ValueMap::iterator iter(value_map_.begin());
-       iter != value_map_.end(); ++iter)
-    delete iter->second;
-  value_map_.clear();
-}
-
-void MediaFormat::SetAsBoolean(const std::string& key, bool in_value) {
-  ReleaseValue(key);
-  value_map_[key] = Value::CreateBooleanValue(in_value);
-}
-
-void MediaFormat::SetAsInteger(const std::string& key, int in_value) {
-  ReleaseValue(key);
-  value_map_[key] = Value::CreateIntegerValue(in_value);
-}
-
-void MediaFormat::SetAsReal(const std::string& key, double in_value) {
-  ReleaseValue(key);
-  value_map_[key] = Value::CreateDoubleValue(in_value);
-}
-
-void MediaFormat::SetAsString(const std::string& key,
-                              const std::string& in_value) {
-  ReleaseValue(key);
-  value_map_[key] = Value::CreateStringValue(in_value);
-}
-
-bool MediaFormat::GetAsBoolean(const std::string& key, bool* out_value) const {
-  Value* value = GetValue(key);
-  return value != NULL && value->GetAsBoolean(out_value);
-}
-
-bool MediaFormat::GetAsInteger(const std::string& key, int* out_value) const {
-  Value* value = GetValue(key);
-  return value != NULL && value->GetAsInteger(out_value);
-}
-
-bool MediaFormat::GetAsReal(const std::string& key, double* out_value) const {
-  Value* value = GetValue(key);
-  return value != NULL && value->GetAsDouble(out_value);
-}
-
-bool MediaFormat::GetAsString(const std::string& key,
-                              std::string* out_value) const {
-  Value* value = GetValue(key);
-  return value != NULL && value->GetAsString(out_value);
-}
-
-Value* MediaFormat::GetValue(const std::string& key) const {
-  ValueMap::const_iterator value_iter = value_map_.find(key);
-  return (value_iter == value_map_.end()) ? NULL : value_iter->second;
-}
-
-void MediaFormat::ReleaseValue(const std::string& key) {
-  ValueMap::iterator vm = value_map_.find(key);
-  if (vm != value_map_.end()) {
-    delete vm->second;
-  }
-}
-
-bool MediaFormat::operator==(MediaFormat const& other) const {
-  return value_map_ == other.value_map_;
-}
-
-}  // namespace media
diff --git a/media/base/media_format.h b/media/base/media_format.h
deleted file mode 100644
index 419488b..0000000
--- a/media/base/media_format.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MEDIA_BASE_MEDIA_FORMAT_H_
-#define MEDIA_BASE_MEDIA_FORMAT_H_
-
-#include <map>
-#include <string>
-
-#include "base/values.h"
-
-namespace media {
-
-// MediaFormat is used to describe the output of a Filter to determine whether
-// a downstream filter can accept the output from an upstream filter.
-//
-// For example, an audio decoder could output key-values for the number of
-// channels and the sample rate.  A downstream audio renderer would use this
-// information to properly initialize the audio hardware before playback
-// started.
-class MediaFormat {
- public:
-  // Common keys.
-  static const char kURL[];
-  static const char kSurfaceType[];
-  static const char kSurfaceFormat[];
-  static const char kSampleRate[];
-  static const char kSampleBits[];
-  static const char kChannels[];
-  static const char kWidth[];
-  static const char kHeight[];
-
-  MediaFormat();
-  ~MediaFormat();
-
-  // Basic map operations.
-  bool empty() const { return value_map_.empty(); }
-
-  bool Contains(const std::string& key) const;
-
-  void Clear();
-
-  // Value accessors.
-  void SetAsBoolean(const std::string& key, bool in_value);
-  void SetAsInteger(const std::string& key, int in_value);
-  void SetAsReal(const std::string& key, double in_value);
-  void SetAsString(const std::string& key, const std::string& in_value);
-
-  bool GetAsBoolean(const std::string& key, bool* out_value) const;
-  bool GetAsInteger(const std::string& key, int* out_value) const;
-  bool GetAsReal(const std::string& key, double* out_value) const;
-  bool GetAsString(const std::string& key, std::string* out_value) const;
-
-  bool operator==(MediaFormat const& other) const;
-
- private:
-  // Helper to return a value.
-  Value* GetValue(const std::string& key) const;
-
-  // Helper to release Value of the key
-  void ReleaseValue(const std::string& key);
-
-  typedef std::map<std::string, Value*> ValueMap;
-  ValueMap value_map_;
-
-  DISALLOW_COPY_AND_ASSIGN(MediaFormat);
-};
-
-}  // namespace media
-
-#endif  // MEDIA_BASE_MEDIA_FORMAT_H_
diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
index 417ae90..6abb9db 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -77,7 +77,6 @@ class MockDataSource : public DataSource {
   MOCK_METHOD0(OnAudioRendererDisabled, void());
 
   // DataSource implementation.
-  MOCK_METHOD0(media_format, const MediaFormat&());
   MOCK_METHOD4(Read, void(int64 position, size_t size, uint8* data,
                           DataSource::ReadCallback* callback));
   MOCK_METHOD1(GetSize, bool(int64* size_out));
@@ -157,7 +156,6 @@ class MockDemuxerStream : public DemuxerStream {
 
   // DemuxerStream implementation.
   MOCK_METHOD0(type, Type());
-  MOCK_METHOD0(media_format, const MediaFormat&());
   MOCK_METHOD1(Read, void(const ReadCallback& read_callback));
   MOCK_METHOD0(GetAVStream, AVStream*());
   MOCK_METHOD0(EnableBitstreamConverter, void());
@@ -166,8 +164,6 @@ class MockDemuxerStream : public DemuxerStream {
   virtual ~MockDemuxerStream();
 
  private:
-  MediaFormat media_format_;
-
   DISALLOW_COPY_AND_ASSIGN(MockDemuxerStream);
 };
 
diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc
index 4dda8ed..c75b740 100644
--- a/media/base/pipeline_impl.cc
+++ b/media/base/pipeline_impl.cc
@@ -17,7 +17,6 @@
 #include "base/synchronization/condition_variable.h"
 #include "media/base/clock.h"
 #include "media/base/filter_collection.h"
-#include "media/base/media_format.h"
 
 namespace media {
 
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc
index 3758ae8..42496a3 100644
--- a/media/base/pipeline_impl_unittest.cc
+++ b/media/base/pipeline_impl_unittest.cc
@@ -8,7 +8,6 @@
 #include "base/stl_util.h"
 #include "base/threading/simple_thread.h"
 #include "media/base/pipeline_impl.h"
-#include "media/base/media_format.h"
 #include "media/base/filters.h"
 #include "media/base/filter_host.h"
 #include "media/base/mock_callback.h"
diff --git a/media/filters/adaptive_demuxer.cc b/media/filters/adaptive_demuxer.cc
index 8f5750d..f08e32d 100644
--- a/media/filters/adaptive_demuxer.cc
+++ b/media/filters/adaptive_demuxer.cc
@@ -165,7 +165,6 @@ void AdaptiveDemuxerStream::DCheckSanity() {
 
   bool non_null_stream_seen = false;
   Type type = DemuxerStream::UNKNOWN;
-  const MediaFormat* media_format = NULL;
   for (size_t i = 0; i < streams_.size(); ++i) {
     if (!streams_[i])
       continue;
@@ -173,10 +172,8 @@ void AdaptiveDemuxerStream::DCheckSanity() {
     if (!non_null_stream_seen) {
       non_null_stream_seen = true;
       type = streams_[i]->type();
-      media_format = &streams_[i]->media_format();
     } else {
       DCHECK_EQ(streams_[i]->type(), type);
-      DCHECK(streams_[i]->media_format() == *media_format);
     }
   }
 }
@@ -223,10 +220,6 @@ DemuxerStream::Type AdaptiveDemuxerStream::type() {
   return current_stream()->type();
 }
 
-const MediaFormat& AdaptiveDemuxerStream::media_format() {
-  return current_stream()->media_format();
-}
-
 void AdaptiveDemuxerStream::EnableBitstreamConverter() {
   {
     base::AutoLock auto_lock(lock_);
diff --git a/media/filters/adaptive_demuxer.h b/media/filters/adaptive_demuxer.h
index d6075ef..73fd7b6 100644
--- a/media/filters/adaptive_demuxer.h
+++ b/media/filters/adaptive_demuxer.h
@@ -18,7 +18,6 @@
 #include "media/base/filter_factories.h"
 #include "media/base/filters.h"
 #include "media/base/pipeline.h"
-#include "media/base/media_format.h"
 
 namespace media {
 
@@ -50,7 +49,8 @@ class AdaptiveDemuxerStream : public DemuxerStream {
   typedef base::Callback<void(base::TimeDelta, SeekFunctionCB)> SeekFunction;
 
   // Keeps references to the passed-in streams.  |streams| must be non-empty and
-  // all the streams in it must agree on type and media_format (or be NULL).
+  // all the streams in it must agree on type.
+  //
   // |initial_stream| must be a valid index into |streams| and specifies the
   // current stream on construction.
   AdaptiveDemuxerStream(StreamVector const& streams, int initial_stream);
@@ -68,7 +68,6 @@ class AdaptiveDemuxerStream : public DemuxerStream {
   // DemuxerStream methods.
   virtual void Read(const ReadCallback& read_callback);
   virtual Type type();
-  virtual const MediaFormat& media_format();
   virtual void EnableBitstreamConverter();
   virtual AVStream* GetAVStream();
 
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc
index eb8412d..c404408 100644
--- a/media/filters/chunk_demuxer.cc
+++ b/media/filters/chunk_demuxer.cc
@@ -80,7 +80,6 @@ class ChunkDemuxerStream : public DemuxerStream {
   // DemuxerStream methods.
   virtual void Read(const ReadCallback& read_callback);
   virtual Type type();
-  virtual const MediaFormat& media_format();
   virtual void EnableBitstreamConverter();
   virtual AVStream* GetAVStream();
 
@@ -88,7 +87,6 @@ class ChunkDemuxerStream : public DemuxerStream {
   static void RunCallback(ReadCallback cb, scoped_refptr<Buffer> buffer);
 
   Type type_;
-  MediaFormat media_format_;
   AVStream* av_stream_;
 
   mutable base::Lock lock_;
@@ -260,8 +258,6 @@ void ChunkDemuxerStream::Read(const ReadCallback& read_callback) {
 
 DemuxerStream::Type ChunkDemuxerStream::type() { return type_; }
 
-const MediaFormat& ChunkDemuxerStream::media_format() { return media_format_; }
-
 void ChunkDemuxerStream::EnableBitstreamConverter() {}
 
 AVStream* ChunkDemuxerStream::GetAVStream() { return av_stream_; }
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index 1dae5cc..e699a77 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -149,10 +149,6 @@ DemuxerStream::Type FFmpegDemuxerStream::type() {
   return type_;
 }
 
-const MediaFormat& FFmpegDemuxerStream::media_format() {
-  return media_format_;
-}
-
 void FFmpegDemuxerStream::Read(const ReadCallback& read_callback) {
   DCHECK(!read_callback.is_null());
 
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h
index e89cb22..4ab7690 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -31,7 +31,6 @@
 #include "media/base/buffers.h"
 #include "media/base/filters.h"
 #include "media/base/pipeline.h"
-#include "media/base/media_format.h"
 #include "media/filters/ffmpeg_glue.h"
 
 // FFmpeg forward declarations.
@@ -73,7 +72,6 @@ class FFmpegDemuxerStream : public DemuxerStream {
 
   // DemuxerStream implementation.
   virtual Type type();
-  virtual const MediaFormat& media_format();
 
   // If |buffer_queue_| is not empty will execute on caller's thread, otherwise
   // will post ReadTask to execute on demuxer's thread. Read will acquire
@@ -104,7 +102,6 @@ class FFmpegDemuxerStream : public DemuxerStream {
   FFmpegDemuxer* demuxer_;
   AVStream* stream_;
   Type type_;
-  MediaFormat media_format_;
   base::TimeDelta duration_;
   bool discontinuous_;
   bool stopped_;
diff --git a/media/filters/file_data_source.cc b/media/filters/file_data_source.cc
index da03e98..04035dc 100644
--- a/media/filters/file_data_source.cc
+++ b/media/filters/file_data_source.cc
@@ -37,8 +37,6 @@ PipelineStatus FileDataSource::Initialize(const std::string& url) {
     file_size_ = 0;
     return PIPELINE_ERROR_URL_NOT_FOUND;
   }
-  media_format_.SetAsString(MediaFormat::kURL, url);
-
   if (host()) {
     host()->SetTotalBytes(file_size_);
     host()->SetBufferedBytes(file_size_);
@@ -68,10 +66,6 @@ void FileDataSource::Stop(FilterCallback* callback) {
   }
 }
 
-const MediaFormat& FileDataSource::media_format() {
-  return media_format_;
-}
-
 void FileDataSource::Read(int64 position, size_t size, uint8* data,
                           ReadCallback* read_callback) {
   DCHECK(file_);
diff --git a/media/filters/file_data_source.h b/media/filters/file_data_source.h
index 27e0d0e..10e61aa 100644
--- a/media/filters/file_data_source.h
+++ b/media/filters/file_data_source.h
@@ -27,7 +27,6 @@ class FileDataSource : public DataSource {
   virtual void Stop(FilterCallback* callback);
 
   // Implementation of DataSource.
-  virtual const MediaFormat& media_format();
   virtual void Read(int64 position, size_t size, uint8* data,
                     ReadCallback* read_callback);
   virtual bool GetSize(int64* size_out);
@@ -49,9 +48,6 @@ class FileDataSource : public DataSource {
   // Size of the file in bytes.
   int64 file_size_;
 
-  // Media format handed out by the DataSource::GetMediaFormat method.
-  MediaFormat media_format_;
-
   // Critical section that protects all of the DataSource methods to prevent
   // a Stop from happening while in the middle of a file I/O operation.
   // TODO(ralphl): Ideally this would use asynchronous I/O or we will know
diff --git a/media/filters/null_audio_renderer.h b/media/filters/null_audio_renderer.h
index 69f5848..28e79b5 100644
--- a/media/filters/null_audio_renderer.h
+++ b/media/filters/null_audio_renderer.h
@@ -12,10 +12,6 @@
 // NullAudioRenderer can also be used in situations where the client has no
 // audio device or we haven't written an audio implementation for a particular
 // platform yet.
-//
-// It supports any type of MediaFormat as long as the mime type has been set to
-// audio/x-uncompressed.  Playback rate is also supported and NullAudioRenderer
-// will slow down and speed up accordingly.
 
 #include <deque>
 
@@ -47,8 +43,7 @@ class NullAudioRenderer
 
  private:
   // A number to convert bytes written in FillBuffer to milliseconds based on
-  // the audio format.  Calculated in OnInitialize by looking at the decoder's
-  // MediaFormat.
+  // the audio format.
   size_t bytes_per_millisecond_;
 
   // A buffer passed to FillBuffer to advance playback.
diff --git a/media/media.gyp b/media/media.gyp
index 9809a7e..df86e03 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -104,8 +104,6 @@
         'base/h264_bitstream_converter.cc',
         'base/h264_bitstream_converter.h',
         'base/media.h',
-        'base/media_format.cc',
-        'base/media_format.h',
         'base/media_posix.cc',
         'base/media_switches.cc',
         'base/media_switches.h',
diff --git a/webkit/glue/media/buffered_data_source.cc b/webkit/glue/media/buffered_data_source.cc
index 4e38b54..c125dd6 100644
--- a/webkit/glue/media/buffered_data_source.cc
+++ b/webkit/glue/media/buffered_data_source.cc
@@ -103,8 +103,6 @@ void BufferedDataSource::Initialize(const std::string& url,
   DCHECK(callback);
   initialize_callback_.reset(callback);
 
-  media_format_.SetAsString(media::MediaFormat::kURL, url);
-
   // Post a task to complete the initialization task.
   render_loop_->PostTask(FROM_HERE,
       NewRunnableMethod(this, &BufferedDataSource::InitializeTask));
diff --git a/webkit/glue/media/buffered_data_source.h b/webkit/glue/media/buffered_data_source.h
index a1444e9..408d095 100644
--- a/webkit/glue/media/buffered_data_source.h
+++ b/webkit/glue/media/buffered_data_source.h
@@ -43,10 +43,6 @@ class BufferedDataSource : public WebDataSource {
   virtual bool IsStreaming();
   virtual void SetPreload(media::Preload preload);
 
-  const media::MediaFormat& media_format() {
-    return media_format_;
-  }
-
   // webkit_glue::WebDataSource implementation.
   virtual void Initialize(const std::string& url,
                           media::PipelineStatusCallback* callback);
@@ -125,8 +121,6 @@ class BufferedDataSource : public WebDataSource {
 
   void UpdateHostState();
 
-  media::MediaFormat media_format_;
-
   // URL of the resource requested.
   GURL url_;
 
diff --git a/webkit/glue/media/simple_data_source.cc b/webkit/glue/media/simple_data_source.cc
index 57c51ad..97c4d7a 100644
--- a/webkit/glue/media/simple_data_source.cc
+++ b/webkit/glue/media/simple_data_source.cc
@@ -91,7 +91,7 @@ void SimpleDataSource::Initialize(
     initialize_callback_.reset(callback);
 
     // Validate the URL.
-    SetURL(GURL(url));
+    url_ = GURL(url);
     if (!url_.is_valid() || !IsProtocolSupportedForMedia(url_)) {
       DoneInitialization_Locked(false);
       return;
@@ -114,10 +114,6 @@ void SimpleDataSource::CancelInitialize() {
       NewRunnableMethod(this, &SimpleDataSource::CancelTask));
 }
 
-const media::MediaFormat& SimpleDataSource::media_format() {
-  return media_format_;
-}
-
 void SimpleDataSource::Read(int64 position,
                             size_t size,
                             uint8* data,
@@ -266,12 +262,6 @@ void SimpleDataSource::Abort() {
   frame_ = NULL;
 }
 
-void SimpleDataSource::SetURL(const GURL& url) {
-  url_ = url;
-  media_format_.Clear();
-  media_format_.SetAsString(media::MediaFormat::kURL, url.spec());
-}
-
 void SimpleDataSource::StartTask() {
   DCHECK(MessageLoop::current() == render_loop_);
   // Reference to prevent destruction while inside the |initialize_callback_|
diff --git a/webkit/glue/media/simple_data_source.h b/webkit/glue/media/simple_data_source.h
index 98934d3..721a8bad 100644
--- a/webkit/glue/media/simple_data_source.h
+++ b/webkit/glue/media/simple_data_source.h
@@ -47,7 +47,6 @@ class SimpleDataSource
   virtual void Stop(media::FilterCallback* callback);
 
   // media::DataSource implementation.
-  virtual const media::MediaFormat& media_format();
   virtual void Read(int64 position, size_t size,
                     uint8* data, ReadCallback* read_callback);
   virtual bool GetSize(int64* size_out);
@@ -95,9 +94,6 @@ class SimpleDataSource
   virtual void Abort();
 
  private:
-  // Updates |url_| and |media_format_| with the given URL.
-  void SetURL(const GURL& url);
-
   // Creates and starts the resource loading on the render thread.
   void StartTask();
 
@@ -119,7 +115,6 @@ class SimpleDataSource
   // Does the work of loading and sends data back to this client.
   scoped_ptr<WebKit::WebURLLoader> url_loader_;
 
-  media::MediaFormat media_format_;
   GURL url_;
   std::string data_;
   int64 size_;
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc
index 102116e..62af5bb 100644
--- a/webkit/glue/webmediaplayer_impl.cc
+++ b/webkit/glue/webmediaplayer_impl.cc
@@ -12,7 +12,6 @@
 #include "media/base/composite_data_source_factory.h"
 #include "media/base/filter_collection.h"
 #include "media/base/limits.h"
-#include "media/base/media_format.h"
 #include "media/base/media_switches.h"
 #include "media/base/pipeline_impl.h"
 #include "media/base/video_frame.h"