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

media/base/media_format.h

 // 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.
 
 #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
 // determine whether a downstream filter can accept the output from an upstream
 // filter.  In general, every MediaFormat contains a MIME type describing
 // its output as well as additional key-values describing additional details.
 //
 // For example, an audio decoder could output audio/x-uncompressed and include
 // additional key-values such as the number of channels and the sample rate.
 // An audio renderer would use this information to properly initialize the
 // audio hardware before playback started.
 //
 // It's also perfectly acceptable to create your own MIME types and standards
 // to allow communication between two filters that goes beyond the basics
 // described here.  For example, you could write a video decoder that outputs
 // a MIME type video/x-special for which your video renderer knows it's some
 // special form of decompressed video output that regular video renderers
 // couldn't handle.
 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[];
   static const char kChannels[];
   static const char kWidth[];
   static const char kHeight[];
 
   MediaFormat();
   ~MediaFormat();
 
@@ skipping 21 matching lines @@
 
   typedef std::map<std::string, Value*> ValueMap;
   ValueMap value_map_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaFormat);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MEDIA_FORMAT_H_