Revert 264763 "Wire up codec_delay() to MP3StreamParser and FFmp..."

trunk/src/media/formats/webm/webm_audio_client.cc

 // Copyright 2014 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/formats/webm/webm_audio_client.h"
 
 #include "media/base/audio_decoder_config.h"
 #include "media/base/channel_layout.h"
 #include "media/formats/webm/webm_constants.h"
 
@@ skipping 47 matching lines @@
   if (output_samples_per_second_ > 0)
     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();
   }
 
-  // Convert |codec_delay| from nanoseconds into frames.
-  int codec_delay_in_frames = 0;
-  if (codec_delay != -1) {
-    codec_delay_in_frames =
-        0.5 +
-        samples_per_second * (static_cast<double>(codec_delay) /
-                              base::Time::kNanosecondsPerSecond);
-  }
-
   config->Initialize(
       audio_codec,
       (audio_codec == kCodecOpus) ? kSampleFormatS16 : kSampleFormatPlanarF32,
       channel_layout,
-      samples_per_second,
-      extra_data,
-      extra_data_size,
-      is_encrypted,
-      true,
+      samples_per_second, extra_data, extra_data_size, is_encrypted, true,
       base::TimeDelta::FromMicroseconds(
           (seek_preroll != -1 ? seek_preroll : 0) / 1000),
-      codec_delay_in_frames);
+      base::TimeDelta::FromMicroseconds(
+          (codec_delay != -1 ? codec_delay : 0) / 1000));
   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