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

7 files changed, 2 insertions, 175 deletions

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"