Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(790)

Unified Diff: trunk/src/media/filters/decrypting_audio_decoder_unittest.cc

Issue 242203006: Revert 264763 "Wire up codec_delay() to MP3StreamParser and FFmp..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/media/ffmpeg/ffmpeg_common.cc ('k') | trunk/src/media/filters/decrypting_demuxer_stream.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/media/filters/decrypting_audio_decoder_unittest.cc
===================================================================
--- trunk/src/media/filters/decrypting_audio_decoder_unittest.cc (revision 264802)
+++ trunk/src/media/filters/decrypting_audio_decoder_unittest.cc (working copy)
@@ -123,7 +123,7 @@
config_.Initialize(kCodecVorbis, kSampleFormatPlanarF32,
CHANNEL_LAYOUT_STEREO, kSampleRate, NULL, 0, true, true,
- base::TimeDelta(), 0);
+ base::TimeDelta(), base::TimeDelta());
InitializeAndExpectStatus(config_, PIPELINE_OK);
}
@@ -131,7 +131,7 @@
ReinitializeConfigChange(config_);
}
- void ReinitializeConfigChange(const AudioDecoderConfig& new_config) {
+ void ReinitializeConfigChange(AudioDecoderConfig& new_config) {
EXPECT_CALL(*decryptor_, DeinitializeDecoder(Decryptor::kAudio));
EXPECT_CALL(*decryptor_, InitializeAudioDecoder(_, _))
.WillOnce(RunCallback<1>(true));
« no previous file with comments | « trunk/src/media/ffmpeg/ffmpeg_common.cc ('k') | trunk/src/media/filters/decrypting_demuxer_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698