summaryrefslogtreecommitdiffstats
path: root/media/base
diff options
context:
space:
mode:
authorfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-29 22:05:33 +0000
committerfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-29 22:05:33 +0000
commitbdca921e4dd8e9dd4eebc42489b7fc8d73a246ed (patch)
tree3fda5f74a5e590ecbaca0cde1182556ea61a1b90 /media/base
parent58b169d57ed6445c11795c075144605bf840439a (diff)
downloadchromium_src-bdca921e4dd8e9dd4eebc42489b7fc8d73a246ed.zip
chromium_src-bdca921e4dd8e9dd4eebc42489b7fc8d73a246ed.tar.gz
chromium_src-bdca921e4dd8e9dd4eebc42489b7fc8d73a246ed.tar.bz2
AdaptiveDemuxer{,Factory,Stream} are born!
This family of classes enable presenting media combined from multiple URLs (e.g. pulling audio from one URL and video from another). In the future it will also enable switching sources during playback, but this isn't implemented yet. player_{x11,wtl} have been updated to use these new classes, but webmediaplayer_impl hasn't yet, because I don't want to expose my hacky alternative scheme to the world. BUG=none TEST=trybots Review URL: http://codereview.chromium.org/6769001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79750 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
-rw-r--r--media/base/media_format.cc4
-rw-r--r--media/base/media_format.h2
2 files changed, 6 insertions, 0 deletions
diff --git a/media/base/media_format.cc b/media/base/media_format.cc
index 45df6b6..242cfef 100644
--- a/media/base/media_format.cc
+++ b/media/base/media_format.cc
@@ -86,4 +86,8 @@ void MediaFormat::ReleaseValue(const std::string& key) {
}
}
+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
index 781afd4..419488b 100644
--- a/media/base/media_format.h
+++ b/media/base/media_format.h
@@ -52,6 +52,8 @@ class MediaFormat {
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;