Wire up codec_delay() to MP3StreamParser and FFmpegAudioDecoder.

media/formats/webm/webm_audio_client.cc

Index: media/formats/webm/webm_audio_client.cc
diff --git a/media/formats/webm/webm_audio_client.cc b/media/formats/webm/webm_audio_client.cc
index 6de45028bb70e9f10096c40506c40aa628b1181d..34241e9dd365dd6e0a5e611c9ce63c650ac62cc9 100644
--- a/media/formats/webm/webm_audio_client.cc
+++ b/media/formats/webm/webm_audio_client.cc
@@ -65,6 +65,14 @@ bool WebMAudioClient::InitializeConfig(
     extra_data_size = codec_private.size();
   }
 
+  // Convert |codec_delay| from nanoseconds into samples.
+  int codec_delay_in_samples = 0;
+  if (codec_delay != -1) {
+    codec_delay_in_samples =

[acolwell GONE FROM CHROMIUM, 2014/04/17 21:11:24]

nit: s/samples/frames/ ?

[DaleCurtis, 2014/04/17 21:42:49]

Done.

+        0.5 + samples_per_second * (static_cast<double>(codec_delay) /
+                                    base::Time::kNanosecondsPerSecond);
+  }
+
   config->Initialize(
       audio_codec,
       (audio_codec == kCodecOpus) ? kSampleFormatS16 : kSampleFormatPlanarF32,
@@ -72,8 +80,7 @@ bool WebMAudioClient::InitializeConfig(
       samples_per_second, extra_data, extra_data_size, is_encrypted, true,
       base::TimeDelta::FromMicroseconds(
           (seek_preroll != -1 ? seek_preroll : 0) / 1000),
-      base::TimeDelta::FromMicroseconds(
-          (codec_delay != -1 ? codec_delay : 0) / 1000));
+      codec_delay_in_samples);
   return config->IsValidConfig();
 }