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

Unified Diff: media/filters/audio_decoder_unittest.cc

Issue 1490613005: media config: expand is_encrypted to a struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missed a couple comments Created 4 years, 10 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/filters/audio_decoder_unittest.cc
diff --git a/media/filters/audio_decoder_unittest.cc b/media/filters/audio_decoder_unittest.cc
index 9eae8fa851c8fa7eea37dc9380302270de52b2e1..19f6255d3d26262fd7749295a45930980ca7b0da 100644
--- a/media/filters/audio_decoder_unittest.cc
+++ b/media/filters/audio_decoder_unittest.cc
@@ -21,6 +21,7 @@
#include "media/base/audio_bus.h"
#include "media/base/audio_hash.h"
#include "media/base/decoder_buffer.h"
+#include "media/base/encryption_scheme.h"
#include "media/base/media_util.h"
#include "media/base/test_data_util.h"
#include "media/base/test_helpers.h"
@@ -158,7 +159,7 @@ class AudioDecoderTest : public testing::TestWithParam<DecoderTestData> {
AudioDecoderConfig config;
ASSERT_TRUE(AVCodecContextToAudioDecoderConfig(
- reader_->codec_context_for_testing(), false, &config));
+ reader_->codec_context_for_testing(), Unencrypted(), &config));
EXPECT_EQ(GetParam().codec, config.codec());
EXPECT_EQ(GetParam().samples_per_second, config.samples_per_second());
@@ -384,14 +385,9 @@ TEST_P(OpusAudioDecoderBehavioralTest, InitializeWithNoCodecDelay) {
kOpusExtraData,
kOpusExtraData + arraysize(kOpusExtraData));
AudioDecoderConfig decoder_config;
- decoder_config.Initialize(kCodecOpus,
- kSampleFormatF32,
- CHANNEL_LAYOUT_STEREO,
- 48000,
- extra_data,
- false,
- base::TimeDelta::FromMilliseconds(80),
- 0);
+ decoder_config.Initialize(kCodecOpus, kSampleFormatF32, CHANNEL_LAYOUT_STEREO,
+ 48000, extra_data, Unencrypted(),
+ base::TimeDelta::FromMilliseconds(80), 0);
InitializeDecoder(decoder_config);
}
@@ -402,13 +398,8 @@ TEST_P(OpusAudioDecoderBehavioralTest, InitializeWithBadCodecDelay) {
kOpusExtraData + arraysize(kOpusExtraData));
AudioDecoderConfig decoder_config;
decoder_config.Initialize(
- kCodecOpus,
- kSampleFormatF32,
- CHANNEL_LAYOUT_STEREO,
- 48000,
- extra_data,
- false,
- base::TimeDelta::FromMilliseconds(80),
+ kCodecOpus, kSampleFormatF32, CHANNEL_LAYOUT_STEREO, 48000, extra_data,
+ Unencrypted(), base::TimeDelta::FromMilliseconds(80),
// Use a different codec delay than in the extradata.
100);
InitializeDecoderWithResult(decoder_config, true);

Powered by Google App Engine
This is Rietveld 408576698