Index: chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc |
diff --git a/chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc b/chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc |
index d5a93d6252b2249123968106e50f76921bd4fb25..bdfb535af09a2aa3bdee086b67b78d5fa9d94982 100644 |
--- a/chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc |
+++ b/chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc |
@@ -35,6 +35,7 @@ |
#include "media/base/audio_decoder_config.h" |
#include "media/base/audio_timestamp_helper.h" |
#include "media/base/decoder_buffer.h" |
+#include "media/base/encryption_scheme.h" |
#include "media/base/video_decoder_config.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -68,7 +69,7 @@ VideoConfig DefaultVideoConfig() { |
default_config.codec = kCodecH264; |
default_config.profile = kH264Main; |
default_config.additional_config = nullptr; |
- default_config.is_encrypted = false; |
+ default_config.encryption_scheme = EncryptionScheme::unencrypted(); |
xhwang
2016/03/03 22:33:00
Should this be Unencrypted()?
dougsteed
2016/03/04 19:07:29
I was preserving the original name in the chromeca
|
return default_config; |
} |
@@ -564,7 +565,7 @@ scoped_ptr<BufferFeeder> BufferFeeder::LoadVideo(MediaPipelineBackend* backend, |
video_config.codec = kCodecH264; |
video_config.profile = kH264Main; |
video_config.additional_config = nullptr; |
- video_config.is_encrypted = false; |
+ video_config.encryption_scheme = EncryptionScheme::unencrypted(); |
} else { |
base::FilePath file_path = GetTestDataFilePath(filename); |
DemuxResult demux_result = FFmpegDemuxForTest(file_path, false /* audio */); |