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

Unified Diff: media/cast/audio_receiver/audio_decoder_unittest.cc

Issue 306783002: [Cast] Clean-up: Merge AudioReceiverConfig+VideoReceiverConfig-->FrameReceiverConfig. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix typo Created 6 years, 7 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
Index: media/cast/audio_receiver/audio_decoder_unittest.cc
diff --git a/media/cast/audio_receiver/audio_decoder_unittest.cc b/media/cast/audio_receiver/audio_decoder_unittest.cc
index ee7846c90db14bf4defa0e258f7d94ca61a920d8..11973ab9a09448636083a17a009b449198447c61 100644
--- a/media/cast/audio_receiver/audio_decoder_unittest.cc
+++ b/media/cast/audio_receiver/audio_decoder_unittest.cc
@@ -11,6 +11,7 @@
#include "media/cast/audio_receiver/audio_decoder.h"
#include "media/cast/cast_config.h"
#include "media/cast/test/utility/audio_utility.h"
+#include "media/cast/test/utility/default_config.h"
#include "media/cast/test/utility/standalone_cast_environment.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/opus/src/include/opus.h"
@@ -37,11 +38,10 @@ class AudioDecoderTest : public ::testing::TestWithParam<TestScenario> {
protected:
virtual void SetUp() OVERRIDE {
- AudioReceiverConfig decoder_config;
- decoder_config.use_external_decoder = false;
+ FrameReceiverConfig decoder_config = GetDefaultAudioReceiverConfig();
decoder_config.frequency = GetParam().sampling_rate;
decoder_config.channels = GetParam().num_channels;
- decoder_config.codec = GetParam().codec;
+ decoder_config.codec.audio = GetParam().codec;
audio_decoder_.reset(new AudioDecoder(cast_environment_, decoder_config));
CHECK_EQ(STATUS_AUDIO_INITIALIZED, audio_decoder_->InitializationResult());

Powered by Google App Engine
This is Rietveld 408576698