Support HLS MPEG2 TS with SAMPLE-AES encryption.

media/BUILD.gn

Index: media/BUILD.gn
diff --git a/media/BUILD.gn b/media/BUILD.gn
index e91398a02ec62407a246aab9fa4f75ae4b2e8fa5..cf8d88e738077f72fe4ed35542b11cd99514071c 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -19,6 +19,7 @@ buildflag_header("media_features") {
     "ENABLE_AC3_EAC3_AUDIO_DEMUXING=$enable_ac3_eac3_audio_demuxing",
     "ENABLE_HEVC_DEMUXING=$enable_hevc_demuxing",
     "ENABLE_MSE_MPEG2TS_STREAM_PARSER=$enable_mse_mpeg2ts_stream_parser",
+    "ENABLE_HLS_SAMPLE_AES=$enable_hls_sample_aes",

[ddorwin, 2016/03/23 22:29:26]

Is this a subset/dependent on enable_mse_mpeg2ts_stream_parser?

If so, this should be enforced somewhere. I think GN can throw errors.

Do we need a separate flag for the Part 9-compliant code? Is there any reason
not to build Part 9 if MPEG-2 TS MSE support is built? The non Part 9-complaint
code is another story.

[dougsteed, 2016/03/31 19:09:50]

Done the gni variable check.

I have not include the Part 9 parsing functions except when
enable_hls_sample_aes is set, as discussed below.

   ]
 }
 
@@ -305,6 +306,17 @@ component("media") {
     }
   }
 
+  if (proprietary_codecs && enable_hls_sample_aes) {

[ddorwin, 2016/03/23 22:29:26]

Should this be within in the enable_mse_mpeg2ts_stream_parser condition below?

[dougsteed, 2016/03/31 19:09:50]

I don't strongly object to that, but didn't do it yet because I didn't want to
open up the Part 9 stuff to more general use, instead keeping it as only for use
with HLS SAMPLE_AES. I figure that when if it gets used more widely we could
revisit this.

[ddorwin, 2016/03/31 20:59:21]

I meant should we move this condition and its contents down there. It doesn't
make sense to include these files without MSE MP2TS support. (The flags are
checked, but it seems nice to enforce that here as well.)

proprietary_codecs would be duplicated there, so it would just be if
(enable_hls_sample_aes).

[dougsteed, 2016/04/01 01:19:28]

Done.

+    sources += [
+      "formats/mp2t/ts_section_cat.cc",
+      "formats/mp2t/ts_section_cat.h",
+      "formats/mp2t/ts_section_cets_ecm.cc",
+      "formats/mp2t/ts_section_cets_ecm.h",
+      "formats/mp2t/ts_section_cets_pssh.cc",
+      "formats/mp2t/ts_section_cets_pssh.h",
+    ]
+  }
+
   if (current_cpu == "arm" && arm_use_neon) {
     defines += [ "USE_NEON" ]
   }
@@ -438,6 +450,8 @@ component("media") {
     ]
     if (enable_mse_mpeg2ts_stream_parser) {
       sources += [
+        "formats/mp2t/descriptors.cc",
+        "formats/mp2t/descriptors.h",
         "formats/mp2t/es_adapter_video.cc",
         "formats/mp2t/es_adapter_video.h",
         "formats/mp2t/es_parser.cc",
@@ -700,6 +714,9 @@ test("media_unittests") {
     if (enable_hevc_demuxing) {
       sources += [ "filters/h265_parser_unittest.cc" ]
     }
+    if (enable_hls_sample_aes) {
+      deps += [ "//third_party/boringssl" ]
+    }
   }
 
   if (is_mac || is_ios) {