media: Opus support for WebM in Media Source

media/webm/webm_audio_client.cc

Index: media/webm/webm_audio_client.cc
diff --git a/media/webm/webm_audio_client.cc b/media/webm/webm_audio_client.cc
index e52f44b4a9a7f33ee8bf8119b044999e4e4c8eee..3cec3fb10ed7df0d4109e545a946f3abc79fb879 100644
--- a/media/webm/webm_audio_client.cc
+++ b/media/webm/webm_audio_client.cc
@@ -26,12 +26,15 @@ void WebMAudioClient::Reset() {
 
 bool WebMAudioClient::InitializeConfig(
     const std::string& codec_id, const std::vector<uint8>& codec_private,
-    bool is_encrypted, AudioDecoderConfig* config) {
+    int64 seek_pre_roll, int64 codec_delay, bool is_encrypted,
+    AudioDecoderConfig* config) {
   DCHECK(config);
 
   AudioCodec audio_codec = kUnknownAudioCodec;
   if (codec_id == "A_VORBIS") {
     audio_codec = kCodecVorbis;
+  } else if (codec_id == "A_OPUS" || codec_id == "A_OPUS/EXPERIMENTAL") {
+    audio_codec = kCodecOpus;
   } else {
     MEDIA_LOG(log_cb_) << "Unsupported audio codec_id " << codec_id;
     return false;
@@ -63,8 +66,12 @@ bool WebMAudioClient::InitializeConfig(
   }
 
   config->Initialize(
-      audio_codec, kSampleFormatPlanarF32, channel_layout,
+      audio_codec,
+      (audio_codec == kCodecOpus) ? kSampleFormatS16 : kSampleFormatPlanarF32,
+      channel_layout,
       samples_per_second, extra_data, extra_data_size, is_encrypted, true);
+  config->set_seek_pre_roll(seek_pre_roll);

[fgalligan1, 2013/08/26 21:10:06]

All of the other vales are passed in Initialize. Any reason these are not passed
in like the other values?

[vignesh, 2013/08/26 21:44:23]

Initialize is a generic function which is used at various parts of the codebase.
So i didn't want to change all of them by changing Initialize's signature. If
you think that's the right way to do it, then i can change all the calls to
Initialize with 0 as codec_delay.

[fgalligan1, 2013/08/26 22:11:53]

It looks like it, but you could wait and see what videostack says.

+  config->set_codec_delay(codec_delay);
   return config->IsValidConfig();
 }