Support HLS MPEG2 TS with SAMPLE-AES encryption.

media/BUILD.gn

 # 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.
 
 import("//build/buildflag_header.gni")
 import("//build/config/android/config.gni")
 import("//build/config/arm.gni")
 import("//build/config/features.gni")
 import("//build/config/linux/pkg_config.gni")
 import("//build/config/ui.gni")
 import("//media/media_options.gni")
 import("//testing/libfuzzer/fuzzer_test.gni")
 import("//testing/test.gni")
 
 buildflag_header("media_features") {
   header = "media_features.h"
 
   flags = [
     "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.

   ]
 }
 
 # Common configuration for targets in the media directory.
 # NOT for exporting.
 config("media_config") {
   defines = []
   if (!media_use_libvpx) {
     defines += [ "MEDIA_DISABLE_LIBVPX" ]
   }
@@ skipping 266 matching lines @@
       "formats/mp4/hevc.h",
     ]
     if (media_use_ffmpeg) {
       sources += [
         "filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc",
         "filters/ffmpeg_h265_to_annex_b_bitstream_converter.h",
       ]
     }
   }
 
+  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" ]
   }
 
   if (media_use_libvpx) {
     sources += [
       "filters/vpx_video_decoder.cc",
       "filters/vpx_video_decoder.h",
     ]
     deps += [ "//third_party/libvpx" ]
@@ skipping 113 matching lines @@
       "formats/mpeg/adts_header_parser.h",
       "formats/mpeg/adts_stream_parser.cc",
       "formats/mpeg/adts_stream_parser.h",
       "formats/mpeg/mpeg1_audio_stream_parser.cc",
       "formats/mpeg/mpeg1_audio_stream_parser.h",
       "formats/mpeg/mpeg_audio_stream_parser_base.cc",
       "formats/mpeg/mpeg_audio_stream_parser_base.h",
     ]
     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",
         "formats/mp2t/es_parser.h",
         "formats/mp2t/es_parser_adts.cc",
         "formats/mp2t/es_parser_adts.h",
         "formats/mp2t/es_parser_h264.cc",
         "formats/mp2t/es_parser_h264.h",
         "formats/mp2t/es_parser_mpeg1audio.cc",
         "formats/mp2t/es_parser_mpeg1audio.h",
@@ skipping 242 matching lines @@
     }
     if (media_use_ffmpeg) {
       sources += [
         "filters/ffmpeg_aac_bitstream_converter_unittest.cc",
         "filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc",
       ]
     }
     if (enable_hevc_demuxing) {
       sources += [ "filters/h265_parser_unittest.cc" ]
     }
+    if (enable_hls_sample_aes) {
+      deps += [ "//third_party/boringssl" ]
+    }
   }
 
   if (is_mac || is_ios) {
     deps += [ "//media/base/mac" ]
   }
 
   #      include_dirs += [
   #        # Needed by media_drm_bridge.cc.
   #        target_gen_dir,
   #      ],
@@ skipping 154 matching lines @@
 fuzzer_test("media_vp9_parser_fuzzer") {
   sources = [
     "filters/vp9_parser_fuzzertest.cc",
   ]
   deps = [
     ":media",
     "//base",
   ]
   libfuzzer_options = "filters/vp9_parser_fuzzertest.options"
 }