Add GSM_MS and PCM_ALAW codecs to CrOS FFMPEG.

media/ffmpeg/ffmpeg_common.cc

 // Copyright (c) 2012 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.
 
 #include "media/ffmpeg/ffmpeg_common.h"
 
 #include "base/logging.h"
 
 namespace media {
 
@@ skipping 15 matching lines @@
     case CODEC_ID_AAC:
       return kCodecAAC;
     case CODEC_ID_MP3:
       return kCodecMP3;
     case CODEC_ID_VORBIS:
       return kCodecVorbis;
     case CODEC_ID_PCM_U8:
     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:
       DVLOG(1) << "Unknown audio CodecID: " << codec_id;
   }
   return kUnknownAudioCodec;
 }
 
 static CodecID AudioCodecToCodecID(AudioCodec audio_codec,
                                    int bits_per_channel) {
   switch (audio_codec) {
     case kCodecAAC:
       return CODEC_ID_AAC;
     case kCodecMP3:
       return CODEC_ID_MP3;
     case kCodecPCM:
       switch (bits_per_channel) {
         case 8:
           return CODEC_ID_PCM_U8;
         case 16:
           return CODEC_ID_PCM_S16LE;
         case 32:
           return CODEC_ID_PCM_S24LE;
         default:
           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:
       return CODEC_ID_FLAC;
     case kCodecAMR_NB:
       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:
       DVLOG(1) << "Unknown AudioCodec: " << audio_codec;
   }
   return CODEC_ID_NONE;
 }
 
 VideoCodec CodecIDToVideoCodec(CodecID codec_id) {
   switch (codec_id) {
@@ skipping 294 matching lines @@
         avcodec_close(stream->codec);
       }
     }
   }
 
   // Then finally cleanup the format context.
   avformat_close_input(&format_context);
 }
 
 }  // namespace media