media config: expand is_encrypted to a struct.

chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdint.h>
 
 #include <limits>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 17 matching lines @@
 #include "chromecast/media/cma/base/decoder_config_adapter.h"
 #include "chromecast/media/cma/test/frame_segmenter_for_test.h"
 #include "chromecast/public/cast_media_shlib.h"
 #include "chromecast/public/media/cast_decoder_buffer.h"
 #include "chromecast/public/media/decoder_config.h"
 #include "chromecast/public/media/media_pipeline_backend.h"
 #include "chromecast/public/media/media_pipeline_device_params.h"
 #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"
 
 namespace chromecast {
 namespace media {
 
 class AudioVideoPipelineDeviceTest;
 
 namespace {
 
@@ skipping 13 matching lines @@
   default_config.bytes_per_channel = 2;
   default_config.samples_per_second = 48000;
   return default_config;
 }
 
 VideoConfig DefaultVideoConfig() {
   VideoConfig default_config;
   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 chromecast/public/media files, because
those names have already been exposed to OEMs.
But after further consultation, prefer consistency with media.

Done.

   return default_config;
 }
 
 base::FilePath GetTestDataFilePath(const std::string& name) {
   base::FilePath file_path;
   CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &file_path));
 
   file_path = file_path.Append(FILE_PATH_LITERAL("media"))
       .Append(FILE_PATH_LITERAL("test")).Append(FILE_PATH_LITERAL("data"))
       .AppendASCII(name);
@@ skipping 475 matching lines @@
     base::FilePath file_path = GetTestDataFilePath(filename);
     base::MemoryMappedFile video_stream;
     CHECK(video_stream.Initialize(file_path)) << "Couldn't open stream file: "
                                               << file_path.MaybeAsASCII();
     buffers = H264SegmenterForTest(video_stream.data(), video_stream.length());
 
     // TODO(erickung): Either pull data from stream or make caller specify value
     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 */);
     buffers = demux_result.frames;
     video_config = DecoderConfigAdapter::ToCastVideoConfig(
         kPrimary, demux_result.video_config);
   }
 
   MediaPipelineBackend::VideoDecoder* decoder = backend->CreateVideoDecoder();
   CHECK(decoder);
@@ skipping 572 matching lines @@
   set_sync_type(MediaPipelineDeviceParams::kModeIgnorePtsAndVSync);
   ConfigureForFile("bear-640x360.webm");
   PauseBeforeEos();
   AddEffectsStreams();
   Start();
   message_loop->Run();
 }
 
 }  // namespace media
 }  // namespace chromecast