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

trunk/src/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 "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 280 matching lines @@
     // as it's valid, the true sample format is selected inside the decoder.
     sample_format = kSampleFormatF32;
   }
 
   base::TimeDelta seek_preroll;
   if (codec_context->seek_preroll > 0) {
     seek_preroll = base::TimeDelta::FromMicroseconds(
         codec_context->seek_preroll * 1000000.0 / codec_context->sample_rate);
   }
 
+  base::TimeDelta codec_delay;
+  if (codec_context->delay > 0) {
+    codec_delay = base::TimeDelta::FromMicroseconds(
+        codec_context->delay * 1000000.0 / codec_context->sample_rate);
+  }
+
   config->Initialize(codec,
                      sample_format,
                      channel_layout,
                      codec_context->sample_rate,
                      codec_context->extradata,
                      codec_context->extradata_size,
                      is_encrypted,
                      record_stats,
                      seek_preroll,
-                     codec_context->delay);
+                     codec_delay);
   if (codec != kCodecOpus) {
     DCHECK_EQ(av_get_bytes_per_sample(codec_context->sample_fmt) * 8,
               config->bits_per_channel());
   }
 }
 
 void AVStreamToAudioDecoderConfig(
     const AVStream* stream,
     AudioDecoderConfig* config,
     bool record_stats) {
@@ skipping 251 matching lines @@
       return false;
 
     *out = parsed_time;
     return true;
   }
 
   return false;
 }
 
 }  // namespace media