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

Unified Diff: media/filters/audio_decoder_unittest.cc

Issue 1146913008: Revert of media: Simplify {Audio|Video}Decoder initialization callback. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 | « media/filters/audio_decoder_selector_unittest.cc ('k') | media/filters/decoder_selector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/audio_decoder_unittest.cc
diff --git a/media/filters/audio_decoder_unittest.cc b/media/filters/audio_decoder_unittest.cc
index cd38e4201c37a696019c46a78081a0f5112ac4d7..42b00ee13b8118448597b277e622f1387856a10b 100644
--- a/media/filters/audio_decoder_unittest.cc
+++ b/media/filters/audio_decoder_unittest.cc
@@ -161,13 +161,14 @@
}
void InitializeDecoder(const AudioDecoderConfig& config) {
- InitializeDecoderWithResult(config, true);
- }
-
- void InitializeDecoderWithResult(const AudioDecoderConfig& config,
- bool success) {
+ InitializeDecoderWithStatus(config, PIPELINE_OK);
+ }
+
+ void InitializeDecoderWithStatus(const AudioDecoderConfig& config,
+ PipelineStatus status) {
decoder_->Initialize(
- config, NewExpectedBoolCB(success),
+ config,
+ NewExpectedStatusCB(status),
base::Bind(&AudioDecoderTest::OnDecoderOutput, base::Unretained(this)));
base::RunLoop().RunUntilIdle();
}
@@ -402,7 +403,7 @@
base::TimeDelta::FromMilliseconds(80),
// Use a different codec delay than in the extradata.
100);
- InitializeDecoderWithResult(decoder_config, false);
+ InitializeDecoderWithStatus(decoder_config, DECODER_ERROR_NOT_SUPPORTED);
}
TEST_P(FFmpegAudioDecoderBehavioralTest, InitializeWithBadConfig) {
@@ -414,7 +415,7 @@
NULL,
0,
false);
- InitializeDecoderWithResult(decoder_config, false);
+ InitializeDecoderWithStatus(decoder_config, DECODER_ERROR_NOT_SUPPORTED);
}
const DecodedBufferExpectations kSfxOpusExpectations[] = {
« no previous file with comments | « media/filters/audio_decoder_selector_unittest.cc ('k') | media/filters/decoder_selector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698