Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(132)

Unified Diff: media/formats/mp2t/ts_section_pmt.h

Issue 1517473002: Support HLS MPEG2 TS with SAMPLE-AES encryption. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@encryption_scheme
Patch Set: tidying up prior to review Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 6c82d78ff655c5ab226c5766247f6768f9a749b9..7eefb63c0022b9fdf321a62e6e4575ca37788bf6 100644
--- a/media/formats/mp2t/ts_section_pmt.h
+++ b/media/formats/mp2t/ts_section_pmt.h
@@ -5,8 +5,11 @@
#ifndef MEDIA_FORMATS_MP2T_TS_SECTION_PMT_H_
#define MEDIA_FORMATS_MP2T_TS_SECTION_PMT_H_
+#include <string>
+
#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "media/formats/mp2t/descriptors.h"
#include "media/formats/mp2t/ts_section_psi.h"
namespace media {
@@ -14,11 +17,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);
// 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;
+ typedef base::Callback<void(int, int, const Descriptors&)> RegisterPesCb;
explicit TsSectionPmt(const RegisterPesCb& register_pes_cb);
~TsSectionPmt() override;

Powered by Google App Engine
This is Rietveld 408576698