summaryrefslogtreecommitdiffstats
path: root/media/base/media_format.h
diff options
context:
space:
mode:
authorralphl@chromium.org <ralphl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-28 17:21:23 +0000
committerralphl@chromium.org <ralphl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-28 17:21:23 +0000
commitb026f4aeb159244e47d3b55c5faad7bb3247fd55 (patch)
treeefda81548664ea009160ded8588904185b384ca4 /media/base/media_format.h
parentabc659b6d95cf197c2b96a544351a667e8b96f95 (diff)
downloadchromium_src-b026f4aeb159244e47d3b55c5faad7bb3247fd55.zip
chromium_src-b026f4aeb159244e47d3b55c5faad7bb3247fd55.tar.gz
chromium_src-b026f4aeb159244e47d3b55c5faad7bb3247fd55.tar.bz2
Implementation of Pipeline and FilterHost interfaces. This is a large change, but all of the objects are interrelated.
I am also checking in a basic unit test that creates pipeline, and the data source hangs during initialization. The test sleeps one second and then stops the pipeline. Andrew has already done a first pass on this, and the code has come largely from our working experimental branch. Review URL: http://codereview.chromium.org/18546 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8805 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/media_format.h')
-rw-r--r--media/base/media_format.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/media/base/media_format.h b/media/base/media_format.h
index 6df9f17..298d68c 100644
--- a/media/base/media_format.h
+++ b/media/base/media_format.h
@@ -5,19 +5,24 @@
#ifndef MEDIA_BASE_MEDIA_FORMAT_H_
#define MEDIA_BASE_MEDIA_FORMAT_H_
+#include <map>
+#include <string>
+
#include "base/values.h"
namespace media {
// Common MIME types.
namespace mime_type {
-extern const char kURI[];
+extern const char kURL[];
extern const char kApplicationOctetStream[];
extern const char kMPEGAudio[];
extern const char kAACAudio[];
extern const char kH264AnnexB[];
extern const char kUncompressedAudio[];
extern const char kUncompressedVideo[];
+extern const char kMajorTypeAudio[];
+extern const char kMajorTypeVideo[];
} // namespace mime_type
// MediaFormat is used to describe the output of a MediaFilterInterface to
@@ -40,7 +45,7 @@ class MediaFormat {
public:
// Common keys.
static const char kMimeType[];
- static const char kURI[];
+ static const char kURL[];
static const char kSurfaceFormat[];
static const char kSampleRate[];
static const char kSampleBits[];