[go: nahoru, domu]

Revert 264803 "Revert 264763 "Wire up codec_delay() to MP3Stream..."

> Revert 264763 "Wire up codec_delay() to MP3StreamParser and FFmp..."
> 
> Possible candidate for broken media_unittests:
> 
> http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%28dbg%29%281%29/builds/30043/steps/media_unittests/logs/MediaSource_MP3_TimestampOffset_0
> 
> > Wire up codec_delay() to MP3StreamParser and FFmpegAudioDecoder.
> > 
> > Allows us to drop silent samples from the decoder after initialization
> > and resets.
> > 
> > codec_delay() is always in frames, so I've changed all call sites to use
> > frames instead of a TimeDelta.
> > 
> > Coincidentally also fixes an issue where not enough data was dropped from
> > Vorbis buffers with negative timestamps.
> > 
> > BUG=360961
> > TEST=new pipeline_integration_test
> > 
> > Review URL: https://codereview.chromium.org/239423005
> 
> TBR=dalecurtis@chromium.org
> 
> Review URL: https://codereview.chromium.org/242203006

TBR=rockot@chromium.org

Review URL: https://codereview.chromium.org/243653002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264834 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/media/filters/decrypting_audio_decoder_unittest.cc b/media/filters/decrypting_audio_decoder_unittest.cc
index add52b94..d7f1f9d 100644
--- a/media/filters/decrypting_audio_decoder_unittest.cc
+++ b/media/filters/decrypting_audio_decoder_unittest.cc
@@ -123,7 +123,7 @@
 
     config_.Initialize(kCodecVorbis, kSampleFormatPlanarF32,
                        CHANNEL_LAYOUT_STEREO, kSampleRate, NULL, 0, true, true,
-                       base::TimeDelta(), base::TimeDelta());
+                       base::TimeDelta(), 0);
     InitializeAndExpectStatus(config_, PIPELINE_OK);
   }
 
@@ -131,7 +131,7 @@
     ReinitializeConfigChange(config_);
   }
 
-  void ReinitializeConfigChange(AudioDecoderConfig& new_config) {
+  void ReinitializeConfigChange(const AudioDecoderConfig& new_config) {
     EXPECT_CALL(*decryptor_, DeinitializeDecoder(Decryptor::kAudio));
     EXPECT_CALL(*decryptor_, InitializeAudioDecoder(_, _))
         .WillOnce(RunCallback<1>(true));