diff options
author | ralphl@chromium.org <ralphl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-28 17:21:23 +0000 |
---|---|---|
committer | ralphl@chromium.org <ralphl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-28 17:21:23 +0000 |
commit | b026f4aeb159244e47d3b55c5faad7bb3247fd55 (patch) | |
tree | efda81548664ea009160ded8588904185b384ca4 /media/base/media_format.cc | |
parent | abc659b6d95cf197c2b96a544351a667e8b96f95 (diff) | |
download | chromium_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.cc')
-rw-r--r-- | media/base/media_format.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/media/base/media_format.cc b/media/base/media_format.cc index 304956f..543ada8 100644 --- a/media/base/media_format.cc +++ b/media/base/media_format.cc @@ -8,10 +8,10 @@ namespace media { namespace mime_type { -// Represents a URI, typically used to create a DataSourceInterface. +// Represents a URL, typically used to create a DataSourceInterface. // Expected keys: -// kUri String The URI -const char kURI[] = "text/x-uri"; +// kURL String The URL +const char kURL[] = "text/x-url"; // Represents a generic byte stream, typically from a DataSourceInterface. // Expected keys: @@ -44,11 +44,15 @@ const char kUncompressedAudio[] = "audio/x-uncompressed"; // kHeight Integer Display height of the surface const char kUncompressedVideo[] = "video/x-uncompressed"; +// Major types of media types begin with the prefix "audio/" or "video/". +const char kMajorTypeVideo[] = "video/"; +const char kMajorTypeAudio[] = "audio/"; + } // namespace mime_type // Common keys. const char MediaFormat::kMimeType[] = "MimeType"; -const char MediaFormat::kURI[] = "Uri"; +const char MediaFormat::kURL[] = "URL"; const char MediaFormat::kSurfaceFormat[] = "SurfaceFormat"; const char MediaFormat::kSampleRate[] = "SampleRate"; const char MediaFormat::kSampleBits[] = "SampleBits"; |