Add Opus decode wrapper to media.

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/basictypes.h"
 #include "base/logging.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/video_frame.h"
@@ skipping 65 matching lines @@
     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;
+    case CODEC_ID_OPUS:
+      return kCodecOpus;
     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:
@@ skipping 21 matching lines @@
     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;
+    case kCodecOpus:
+      return CODEC_ID_OPUS;
     default:
       DVLOG(1) << "Unknown AudioCodec: " << audio_codec;
   }
   return CODEC_ID_NONE;
 }
 
 VideoCodec CodecIDToVideoCodec(CodecID codec_id) {
   switch (codec_id) {
     case CODEC_ID_VC1:
       return kCodecVC1;
@@ skipping 81 matching lines @@
   return FF_PROFILE_UNKNOWN;
 }
 
 void AVCodecContextToAudioDecoderConfig(
     const AVCodecContext* codec_context,
     AudioDecoderConfig* config) {
   DCHECK_EQ(codec_context->codec_type, AVMEDIA_TYPE_AUDIO);
 
   AudioCodec codec = CodecIDToAudioCodec(codec_context->codec_id);
   int bytes_per_channel = av_get_bytes_per_sample(codec_context->sample_fmt);
+
+  AVSampleFormat sample_format = codec_context->sample_fmt;

[DaleCurtis, 2012/12/15 01:13:22]

I meant you should do this above line 231 and replace the
"codec_context->sample_fmt" there with just "sample_fmt" that way you don't have
two pieces of code calling av_get_bytes_per_sample().

[Tom Finegan, 2012/12/15 01:24:33]

Done.

+  if (codec == kCodecOpus) {
+    // TODO(tomfinegan): |sample_fmt| in |codec_context| is -1... because
+    // libopusdec.c isn't built into ffmpegsumo...? Maybe it's not *that* big
+    // a deal since libopus will produce either float or S16 samples, and
+    // OpusAudioDecoder is the only provider of Opus support.
+    sample_format = AV_SAMPLE_FMT_S16;
+    bytes_per_channel = av_get_bytes_per_sample(sample_format);
+  }
+
   ChannelLayout channel_layout =
       ChannelLayoutToChromeChannelLayout(codec_context->channel_layout,
                                          codec_context->channels);
   int samples_per_second = codec_context->sample_rate;
 
   config->Initialize(codec,
                      bytes_per_channel << 3,
                      channel_layout,
                      samples_per_second,
                      codec_context->extradata,
@@ skipping 183 matching lines @@
       return PIX_FMT_YUV422P;
     case VideoFrame::YV12:
       return PIX_FMT_YUV420P;
     default:
       DVLOG(1) << "Unsupported VideoFrame::Format: " << video_format;
   }
   return PIX_FMT_NONE;
 }
 
 }  // namespace media