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

Unified Diff: media/ffmpeg/ffmpeg_common_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: more ddorwin 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/ffmpeg/ffmpeg_common_unittest.cc
diff --git a/media/ffmpeg/ffmpeg_common_unittest.cc b/media/ffmpeg/ffmpeg_common_unittest.cc
index 1d3340585614d825d34a331e0dc55bfef6c98e50..bde7e86e2cc93b1828d4dfb597c7d7d1c8f3a83c 100644
--- a/media/ffmpeg/ffmpeg_common_unittest.cc
+++ b/media/ffmpeg/ffmpeg_common_unittest.cc
@@ -13,6 +13,7 @@
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "media/base/audio_decoder_config.h"
+#include "media/base/encryption_scheme.h"
#include "media/base/media.h"
#include "media/base/test_data_util.h"
#include "media/base/video_decoder_config.h"
@@ -134,8 +135,8 @@ TEST_F(FFmpegCommonTest, OpusAudioDecoderConfig) {
context.sample_rate = 44100;
AudioDecoderConfig decoder_config;
- ASSERT_TRUE(AVCodecContextToAudioDecoderConfig(&context, false,
- &decoder_config));
+ ASSERT_TRUE(AVCodecContextToAudioDecoderConfig(
+ &context, EncryptionScheme::Unencrypted(), &decoder_config));
EXPECT_EQ(48000, decoder_config.samples_per_second());
}

Powered by Google App Engine
This is Rietveld 408576698