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

trunk/src/media/formats/mpeg/mp3_stream_parser.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/mpeg/mp3_stream_parser.h"
 
 namespace media {
 
 static const uint32 kMP3StartCodeMask = 0xffe00000;
 
@@ skipping 72 matching lines @@
 static const int kVersion2 = 2;
 static const int kVersionReserved = 1;
 static const int kVersion2_5 = 0;
 static const int kLayerReserved = 0;
 static const int kLayer1 = 3;
 static const int kLayer2 = 2;
 static const int kLayer3 = 1;
 static const int kBitrateFree = 0;
 static const int kBitrateBad = 0xf;
 static const int kSampleRateReserved = 3;
-static const int kCodecDelay = 529;
 
 MP3StreamParser::MP3StreamParser()
-    : MPEGAudioStreamParserBase(kMP3StartCodeMask, kCodecMP3, kCodecDelay) {}
+    : MPEGAudioStreamParserBase(kMP3StartCodeMask, kCodecMP3) {}
 
 MP3StreamParser::~MP3StreamParser() {}
 
 int MP3StreamParser::ParseFrameHeader(const uint8* data,
                                       int size,
                                       int* frame_size,
                                       int* sample_rate,
                                       ChannelLayout* channel_layout,
                                       int* sample_count,
                                       bool* metadata_frame) const {
@@ skipping 164 matching lines @@
     if (metadata_frame)
       *metadata_frame = true;
     return reader.bits_read() / 8;
   }
 
   // If it wasn't a XING frame, just return the number consumed bytes.
   return header_bytes_read;
 }
 
 }  // namespace media