Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(832)

Unified Diff: media/base/audio_decoder_config.h

Issue 10452004: Add GSM_MS and PCM_ALAW codecs to CrOS FFMPEG. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/base/audio_decoder_config.h
===================================================================
--- media/base/audio_decoder_config.h (revision 147908)
+++ media/base/audio_decoder_config.h (working copy)
@@ -26,13 +26,16 @@
// ChromeOS specific codecs.
kCodecAMR_NB,
kCodecAMR_WB,
+ kCodecGSM_MS,
DaleCurtis 2012/07/25 18:22:14 I think you need to put this at the end otherwise
ilja 2012/07/25 20:09:37 Done.
kCodecPCM_MULAW,
+ kCodecPCM_S16BE,
+ kCodecPCM_S24BE,
// DO NOT ADD RANDOM AUDIO CODECS!
//
// The only acceptable time to add a new codec is if there is production code
// that uses said codec in the same CL.
- kAudioCodecMax = kCodecPCM_MULAW // Must equal the last "real" codec above.
+ kAudioCodecMax = kCodecPCM_S24BE // Must equal the last "real" codec above.
};
// TODO(dalecurtis): FFmpeg API uses |bytes_per_channel| instead of

Powered by Google App Engine
This is Rietveld 408576698