diff options
| author | ihf@chromium.org <ihf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-26 23:11:18 +0000 |
|---|---|---|
| committer | ihf@chromium.org <ihf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-26 23:11:18 +0000 |
| commit | de1649a6ec474ae6711bdfd3b61a8a22fed1bed8 (patch) | |
| tree | ff0786f1448210c3f98fbd74cdc6875d004bfde0 /media/base/audio_decoder_config.h | |
| parent | a2ad0112b4b9aaff7cddcde84aaa73ddf8bd569f (diff) | |
| download | chromium_src-de1649a6ec474ae6711bdfd3b61a8a22fed1bed8.zip chromium_src-de1649a6ec474ae6711bdfd3b61a8a22fed1bed8.tar.gz chromium_src-de1649a6ec474ae6711bdfd3b61a8a22fed1bed8.tar.bz2 | |
Fix regression and make CrOS audio codecs work again.
TESTS=played relevant 3GP and WAV files on mario
BUG=chromium-os:21037,18938
Review URL: http://codereview.chromium.org/8393037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107462 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/audio_decoder_config.h')
| -rw-r--r-- | media/base/audio_decoder_config.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/media/base/audio_decoder_config.h b/media/base/audio_decoder_config.h index 0245f42..e4891fa 100644 --- a/media/base/audio_decoder_config.h +++ b/media/base/audio_decoder_config.h @@ -18,7 +18,12 @@ enum AudioCodec { kCodecMP3, kCodecPCM, kCodecVorbis, - + // ChromiumOS and ChromeOS specific codecs. + kCodecFLAC, + // ChromeOS specific codecs. + kCodecAMR_NB, + kCodecAMR_WB, + kCodecPCM_MULAW, // DO NOT ADD RANDOM AUDIO CODECS! // // The only acceptable time to add a new codec is if there is production code |