media: Opus support for WebM in Media Source

media/webm/webm_audio_client.cc

 // Copyright (c) 2013 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/webm/webm_audio_client.h"
 
 #include "media/base/audio_decoder_config.h"
 #include "media/base/channel_layout.h"
 #include "media/webm/webm_constants.h"
 
 namespace media {
 
 WebMAudioClient::WebMAudioClient(const LogCB& log_cb)
     : log_cb_(log_cb) {
   Reset();
 }
 
 WebMAudioClient::~WebMAudioClient() {
 }
 
 void WebMAudioClient::Reset() {
   channels_ = -1;
   samples_per_second_ = -1;
   output_samples_per_second_ = -1;
 }
 
 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;
   }
 
   if (samples_per_second_ <= 0)
     return false;
 
   // Set channel layout default if a Channels element was not present.
   if (channels_ == -1)
@@ skipping 11 matching lines @@
     samples_per_second = output_samples_per_second_;
 
   const uint8* extra_data = NULL;
   size_t extra_data_size = 0;
   if (codec_private.size() > 0) {
     extra_data = &codec_private[0];
     extra_data_size = codec_private.size();
   }
 
   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();
 }
 
 bool WebMAudioClient::OnUInt(int id, int64 val) {
   if (id == kWebMIdChannels) {
     if (channels_ != -1) {
       MEDIA_LOG(log_cb_) << "Multiple values for id " << std::hex << id
                          << " specified. (" << channels_ << " and " << val
                          << ")";
       return false;
@@ skipping 25 matching lines @@
     MEDIA_LOG(log_cb_) << "Multiple values for id " << std::hex << id
                        << " specified (" << *dst << " and " << val << ")";
     return false;
   }
 
   *dst = val;
   return true;
 }
 
 }  // namespace media