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

Unified Diff: media/ffmpeg/ffmpeg_common.cc

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
« media/base/audio_decoder_config.h ('K') | « media/base/audio_decoder_config.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/ffmpeg/ffmpeg_common.cc
===================================================================
--- media/ffmpeg/ffmpeg_common.cc (revision 147908)
+++ media/ffmpeg/ffmpeg_common.cc (working copy)
@@ -33,12 +33,18 @@
case CODEC_ID_PCM_S16LE:
case CODEC_ID_PCM_S24LE:
return kCodecPCM;
+ case CODEC_ID_PCM_S16BE:
+ return kCodecPCM_S16BE;
+ case CODEC_ID_PCM_S24BE:
+ return kCodecPCM_S24BE;
case CODEC_ID_FLAC:
return kCodecFLAC;
case CODEC_ID_AMR_NB:
return kCodecAMR_NB;
case CODEC_ID_AMR_WB:
return kCodecAMR_WB;
+ case CODEC_ID_GSM_MS:
+ return kCodecGSM_MS;
case CODEC_ID_PCM_MULAW:
return kCodecPCM_MULAW;
default:
@@ -66,6 +72,10 @@
DVLOG(1) << "Unsupported bits per channel: " << bits_per_channel;
}
break;
+ case kCodecPCM_S16BE:
+ return CODEC_ID_PCM_S16BE;
+ case kCodecPCM_S24BE:
+ return CODEC_ID_PCM_S24BE;
case kCodecVorbis:
return CODEC_ID_VORBIS;
case kCodecFLAC:
@@ -74,6 +84,8 @@
return CODEC_ID_AMR_NB;
case kCodecAMR_WB:
return CODEC_ID_AMR_WB;
+ case kCodecGSM_MS:
+ return CODEC_ID_GSM_MS;
case kCodecPCM_MULAW:
return CODEC_ID_PCM_MULAW;
default:
« media/base/audio_decoder_config.h ('K') | « media/base/audio_decoder_config.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698