| Index: media/formats/mpeg/mpeg_audio_stream_parser_base.cc
|
| diff --git a/media/formats/mpeg/mpeg_audio_stream_parser_base.cc b/media/formats/mpeg/mpeg_audio_stream_parser_base.cc
|
| index 97a5bac912f27698de267b349babd62ff0823aca..4d0a20287eb3406bb0b0ddc746bc7985f3bccf84 100644
|
| --- a/media/formats/mpeg/mpeg_audio_stream_parser_base.cc
|
| +++ b/media/formats/mpeg/mpeg_audio_stream_parser_base.cc
|
| @@ -44,11 +44,13 @@ static int LocateEndOfHeaders(const uint8_t* buf, int buf_len, int i) {
|
| }
|
|
|
| MPEGAudioStreamParserBase::MPEGAudioStreamParserBase(uint32 start_code_mask,
|
| - AudioCodec audio_codec)
|
| + AudioCodec audio_codec,
|
| + int codec_delay)
|
| : state_(UNINITIALIZED),
|
| in_media_segment_(false),
|
| start_code_mask_(start_code_mask),
|
| - audio_codec_(audio_codec) {}
|
| + audio_codec_(audio_codec),
|
| + codec_delay_(codec_delay) {}
|
|
|
| MPEGAudioStreamParserBase::~MPEGAudioStreamParserBase() {}
|
|
|
| @@ -199,9 +201,16 @@ int MPEGAudioStreamParserBase::ParseFrame(const uint8* data,
|
| }
|
|
|
| if (!config_.IsValidConfig()) {
|
| - config_.Initialize(audio_codec_, kSampleFormatF32, channel_layout,
|
| - sample_rate, NULL, 0, false, false,
|
| - base::TimeDelta(), base::TimeDelta());
|
| + config_.Initialize(audio_codec_,
|
| + kSampleFormatF32,
|
| + channel_layout,
|
| + sample_rate,
|
| + NULL,
|
| + 0,
|
| + false,
|
| + false,
|
| + base::TimeDelta(),
|
| + codec_delay_);
|
|
|
| base::TimeDelta base_timestamp;
|
| if (timestamp_helper_)
|
|
|