EME: Require codecs parameter for audio/videoCapabilities

media/blink/key_system_config_selector_unittest.cc

Index: media/blink/key_system_config_selector_unittest.cc
diff --git a/media/blink/key_system_config_selector_unittest.cc b/media/blink/key_system_config_selector_unittest.cc
index 8755020200c0f52ccb67439c48cda7ae3d524d17..6040f5860222a35a812781f51b29c771286a7db2 100644
--- a/media/blink/key_system_config_selector_unittest.cc
+++ b/media/blink/key_system_config_selector_unittest.cc
@@ -633,6 +633,7 @@ TEST_F(KeySystemConfigSelectorTest, VideoCapabilities_SubsetSupported) {
   video_capabilities[0].mimeType = kUnsupportedContainer;
   video_capabilities[1].contentType = "b";
   video_capabilities[1].mimeType = kSupportedVideoContainer;
+  video_capabilities[1].codecs = kSupportedVideoCodec;

[xhwang, 2017/02/09 20:07:55]

Can we add a test where everything in the capabilities are legit but the codecs
is missing? That capabilities should be supported without this CL, but not
supported now.

[jrummell, 2017/02/09 23:36:08]

Done.

 
   blink::WebMediaKeySystemConfiguration config = EmptyConfiguration();
   config.videoCapabilities = video_capabilities;
@@ -648,6 +649,7 @@ TEST_F(KeySystemConfigSelectorTest, VideoCapabilities_AllSupported) {
   std::vector<blink::WebMediaKeySystemMediaCapability> video_capabilities(2);
   video_capabilities[0].contentType = "a";
   video_capabilities[0].mimeType = kSupportedVideoContainer;
+  video_capabilities[0].codecs = kSupportedVideoCodecs;
   video_capabilities[1].contentType = "b";
   video_capabilities[1].mimeType = kSupportedVideoContainer;
   video_capabilities[1].codecs = kSupportedVideoCodecs;
@@ -695,6 +697,7 @@ TEST_F(KeySystemConfigSelectorTest, VideoCapabilities_Robustness_Empty) {
   std::vector<blink::WebMediaKeySystemMediaCapability> video_capabilities(1);
   video_capabilities[0].contentType = "a";
   video_capabilities[0].mimeType = kSupportedVideoContainer;
+  video_capabilities[0].codecs = kSupportedVideoCodec;
   ASSERT_TRUE(video_capabilities[0].robustness.isEmpty());
 
   blink::WebMediaKeySystemConfiguration config = EmptyConfiguration();
@@ -710,6 +713,7 @@ TEST_F(KeySystemConfigSelectorTest, VideoCapabilities_Robustness_Supported) {
   std::vector<blink::WebMediaKeySystemMediaCapability> video_capabilities(1);
   video_capabilities[0].contentType = "a";
   video_capabilities[0].mimeType = kSupportedVideoContainer;
+  video_capabilities[0].codecs = kSupportedVideoCodec;
   video_capabilities[0].robustness = kSupported;
 
   blink::WebMediaKeySystemConfiguration config = EmptyConfiguration();
@@ -725,6 +729,7 @@ TEST_F(KeySystemConfigSelectorTest, VideoCapabilities_Robustness_Unsupported) {
   std::vector<blink::WebMediaKeySystemMediaCapability> video_capabilities(1);
   video_capabilities[0].contentType = "a";
   video_capabilities[0].mimeType = kSupportedVideoContainer;
+  video_capabilities[0].codecs = kSupportedVideoCodec;
   video_capabilities[0].robustness = kUnsupported;
 
   blink::WebMediaKeySystemConfiguration config = EmptyConfiguration();
@@ -742,6 +747,7 @@ TEST_F(KeySystemConfigSelectorTest,
   std::vector<blink::WebMediaKeySystemMediaCapability> video_capabilities(1);
   video_capabilities[0].contentType = "a";
   video_capabilities[0].mimeType = kSupportedVideoContainer;
+  video_capabilities[0].codecs = kSupportedVideoCodec;
   video_capabilities[0].robustness = kRequireIdentifier;
 
   blink::WebMediaKeySystemConfiguration config = EmptyConfiguration();
@@ -761,6 +767,7 @@ TEST_F(KeySystemConfigSelectorTest,
   std::vector<blink::WebMediaKeySystemMediaCapability> video_capabilities(1);
   video_capabilities[0].contentType = "a";
   video_capabilities[0].mimeType = kSupportedVideoContainer;
+  video_capabilities[0].codecs = kSupportedVideoCodec;
   video_capabilities[0].robustness = kRecommendIdentifier;
 
   blink::WebMediaKeySystemConfiguration config = EmptyConfiguration();
@@ -782,6 +789,7 @@ TEST_F(KeySystemConfigSelectorTest, AudioCapabilities_SubsetSupported) {
   audio_capabilities[0].mimeType = kUnsupportedContainer;
   audio_capabilities[1].contentType = "b";
   audio_capabilities[1].mimeType = kSupportedAudioContainer;
+  audio_capabilities[1].codecs = kSupportedAudioCodec;
 
   blink::WebMediaKeySystemConfiguration config = EmptyConfiguration();
   config.audioCapabilities = audio_capabilities;