Implementation of Pipeline and FilterHost interfaces. This is a large change...

media/base/media_format.cc

 // Copyright (c) 2006-2008 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 {
 
 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:
 //   None
 const char kApplicationOctetStream[]        = "application/octet-stream";
 
 // Represents encoded audio data, typically from an DemuxerStreamInterface.
 // Expected keys:
 //   None
 const char kMPEGAudio[]                     = "audio/mpeg";
@@ skipping 12 matching lines @@
 const char kUncompressedAudio[]             = "audio/x-uncompressed";
 
 // Represents decoded video data, typically from a VideoDecoderInterface.
 // Other information, such as surface format (i.e., YV12), stride and planes are
 // included with the buffer itself and is not part of the MediaFormat.
 // Expected keys:
 //   kWidth           Integer         Display width of the surface
 //   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";
 const char MediaFormat::kChannels[]         = "Channels";
 const char MediaFormat::kWidth[]            = "Width";
 const char MediaFormat::kHeight[]           = "Height";
 
 MediaFormat::MediaFormat() {
 }
 
@@ skipping 49 matching lines @@
   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;
 }
 
 }  // namespace media