Wire up codec_delay() to MP3StreamParser and FFmpegAudioDecoder.

media/formats/mpeg/mpeg_audio_stream_parser_base.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/mpeg_audio_stream_parser_base.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "media/base/buffers.h"
@@ skipping 26 matching lines @@
       was_lf = true;
     } else if (c != '\r' || last_c != '\n') {
       was_lf = false;
     }
     last_c = c;
   }
   return -1;
 }
 
 MPEGAudioStreamParserBase::MPEGAudioStreamParserBase(uint32 start_code_mask,
-                                                     AudioCodec audio_codec)
+                                                     AudioCodec audio_codec,
+                                                     int codec_delay_in_frames)
     : state_(UNINITIALIZED),
       in_media_segment_(false),
       start_code_mask_(start_code_mask),
-      audio_codec_(audio_codec) {}
+      audio_codec_(audio_codec),
+      codec_delay_in_frames_(codec_delay_in_frames) {}
 
 MPEGAudioStreamParserBase::~MPEGAudioStreamParserBase() {}
 
 void MPEGAudioStreamParserBase::Init(const InitCB& init_cb,
                                      const NewConfigCB& config_cb,
                                      const NewBuffersCB& new_buffers_cb,
                                      bool ignore_text_tracks,
                                      const NeedKeyCB& need_key_cb,
                                      const NewMediaSegmentCB& new_segment_cb,
                                      const base::Closure& end_of_segment_cb,
@@ skipping 124 matching lines @@
        config_.channel_layout() != channel_layout)) {
     // Clear config data so that a config change is initiated.
     config_ = AudioDecoderConfig();
 
     // Send all buffers associated with the previous config.
     if (!buffers->empty() && !SendBuffers(buffers, true))
       return -1;
   }
 
   if (!config_.IsValidConfig()) {
-    config_.Initialize(audio_codec_, kSampleFormatF32, channel_layout,
-                       sample_rate, NULL, 0, false, false,
-                       base::TimeDelta(), base::TimeDelta());
-
     base::TimeDelta base_timestamp;
     if (timestamp_helper_)
       base_timestamp = timestamp_helper_->GetTimestamp();
 
     timestamp_helper_.reset(new AudioTimestampHelper(sample_rate));
     timestamp_helper_->SetBaseTimestamp(base_timestamp);
 
+    config_.Initialize(
+        audio_codec_,
+        kSampleFormatF32,
+        channel_layout,
+        sample_rate,
+        NULL,
+        0,
+        false,
+        false,
+        base::TimeDelta(),
+        timestamp_helper_->GetFrameDuration(codec_delay_in_frames_));

[DaleCurtis, 2014/04/15 22:22:26]

I'm wondering if we should just change codec_delay() to be in frames instead of
base::TimeDelta since we're essentially converting it unnecessarily in all cases
right now.

[acolwell GONE FROM CHROMIUM, 2014/04/16 15:47:35]

Yes. I think the coding_delay should be in frames since that is the more common
use of this value.

[DaleCurtis, 2014/04/16 18:22:22]

Do you have a preference in naming? Keep codec_delay() or rename to something
like codec_delay_in_frames()?

+
     VideoDecoderConfig video_config;
     bool success = config_cb_.Run(config_, video_config, TextTrackConfigMap());
 
     if (!init_cb_.is_null())
       base::ResetAndReturn(&init_cb_).Run(success, kInfiniteDuration(), true);
 
     if (!success)
       return -1;
   }
 
@@ skipping 174 matching lines @@
   if (end_of_segment) {
     in_media_segment_ = false;
     end_of_segment_cb_.Run();
   }
 
   timestamp_helper_->SetBaseTimestamp(base::TimeDelta());
   return true;
 }
 
 }  // namespace media