summaryrefslogtreecommitdiffstats
path: root/media/base/media_format.cc
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-17 20:04:29 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-17 20:04:29 +0000
commit40e5ac1f115a7905372d3414debaac63a5244886 (patch)
tree1613d237a6e69e0d1f95b1953b8b2572a9f5b52a /media/base/media_format.cc
parentb0c2bda2081e3627baac5814d6c66ef121b88515 (diff)
downloadchromium_src-40e5ac1f115a7905372d3414debaac63a5244886.zip
chromium_src-40e5ac1f115a7905372d3414debaac63a5244886.tar.gz
chromium_src-40e5ac1f115a7905372d3414debaac63a5244886.tar.bz2
andrew's patch
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11904 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/media_format.cc')
-rw-r--r--media/base/media_format.cc20
1 files changed, 12 insertions, 8 deletions
diff --git a/media/base/media_format.cc b/media/base/media_format.cc
index 543ada8..e66e365 100644
--- a/media/base/media_format.cc
+++ b/media/base/media_format.cc
@@ -51,14 +51,18 @@ const char kMajorTypeAudio[] = "audio/";
} // namespace mime_type
// Common keys.
-const char MediaFormat::kMimeType[] = "MimeType";
-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";
+const char MediaFormat::kMimeType[] = "MimeType";
+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";
+const char MediaFormat::kBitRate[] = "BitRate";
+const char MediaFormat::kBitsPerCodedSample[] = "BitsPerCodedSample";
+const char MediaFormat::kBlockAlign[] = "BlockAlign";
+const char MediaFormat::kFrameSize[] = "FrameSize";
MediaFormat::MediaFormat() {
}