Support HLS MPEG2 TS with SAMPLE-AES encryption.

media/formats/mp2t/ts_section_pmt.h

Index: media/formats/mp2t/ts_section_pmt.h
diff --git a/media/formats/mp2t/ts_section_pmt.h b/media/formats/mp2t/ts_section_pmt.h
index b5a1dfdf60ed40dee9f99d47dbc0da13d00b8bb6..380597534b2f4acde6e307083da4834733aa56a0 100644
--- a/media/formats/mp2t/ts_section_pmt.h
+++ b/media/formats/mp2t/ts_section_pmt.h
@@ -5,9 +5,12 @@
 #ifndef MEDIA_FORMATS_MP2T_TS_SECTION_PMT_H_
 #define MEDIA_FORMATS_MP2T_TS_SECTION_PMT_H_
 
+#include <string>

[ddorwin, 2016/04/12 00:40:48]

Not used?

[dougsteed, 2016/05/08 23:18:45]

Done.

+
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
+#include "media/formats/mp2t/descriptors.h"
 #include "media/formats/mp2t/ts_section_psi.h"
 
 namespace media {
@@ -15,11 +18,11 @@ namespace mp2t {
 
 class TsSectionPmt : public TsSectionPsi {
  public:
-  // RegisterPesCb::Run(int pes_pid, int stream_type);
+  // RegisterPesCb::Run(int pes_pid, int stream_type, Descriptors descriptors);

[ddorwin, 2016/04/12 00:40:48]

This line is unclear and uses the wrong type for |descriptors| Is this supposed
to be an example of calling?

[dougsteed, 2016/05/08 23:18:45]

Done.

   // Stream type is defined in
   // "Table 2-34 – Stream type assignments" in H.222
   // TODO(damienv): add the program number.
-  typedef base::Callback<void(int, int)> RegisterPesCb;
+  using RegisterPesCb = base::Callback<void(int, int, const Descriptors&)>;
 
   explicit TsSectionPmt(const RegisterPesCb& register_pes_cb);
   ~TsSectionPmt() override;