OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef MEDIA_FORMATS_MP2T_TS_SECTION_PMT_H_ | 5 #ifndef MEDIA_FORMATS_MP2T_TS_SECTION_PMT_H_ |
6 #define MEDIA_FORMATS_MP2T_TS_SECTION_PMT_H_ | 6 #define MEDIA_FORMATS_MP2T_TS_SECTION_PMT_H_ |
7 | 7 |
8 #include <string> | |
ddorwin
2016/04/12 00:40:48
Not used?
dougsteed
2016/05/08 23:18:45
Done.
| |
9 | |
8 #include "base/callback.h" | 10 #include "base/callback.h" |
9 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
10 #include "base/macros.h" | 12 #include "base/macros.h" |
13 #include "media/formats/mp2t/descriptors.h" | |
11 #include "media/formats/mp2t/ts_section_psi.h" | 14 #include "media/formats/mp2t/ts_section_psi.h" |
12 | 15 |
13 namespace media { | 16 namespace media { |
14 namespace mp2t { | 17 namespace mp2t { |
15 | 18 |
16 class TsSectionPmt : public TsSectionPsi { | 19 class TsSectionPmt : public TsSectionPsi { |
17 public: | 20 public: |
18 // RegisterPesCb::Run(int pes_pid, int stream_type); | 21 // 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 |
dougsteed
2016/05/08 23:18:45
Done.
| |
19 // Stream type is defined in | 22 // Stream type is defined in |
20 // "Table 2-34 – Stream type assignments" in H.222 | 23 // "Table 2-34 – Stream type assignments" in H.222 |
21 // TODO(damienv): add the program number. | 24 // TODO(damienv): add the program number. |
22 typedef base::Callback<void(int, int)> RegisterPesCb; | 25 using RegisterPesCb = base::Callback<void(int, int, const Descriptors&)>; |
23 | 26 |
24 explicit TsSectionPmt(const RegisterPesCb& register_pes_cb); | 27 explicit TsSectionPmt(const RegisterPesCb& register_pes_cb); |
25 ~TsSectionPmt() override; | 28 ~TsSectionPmt() override; |
26 | 29 |
27 // Mpeg2TsPsiParser implementation. | 30 // Mpeg2TsPsiParser implementation. |
28 bool ParsePsiSection(BitReader* bit_reader) override; | 31 bool ParsePsiSection(BitReader* bit_reader) override; |
29 void ResetPsiSection() override; | 32 void ResetPsiSection() override; |
30 | 33 |
31 private: | 34 private: |
32 RegisterPesCb register_pes_cb_; | 35 RegisterPesCb register_pes_cb_; |
33 | 36 |
34 DISALLOW_COPY_AND_ASSIGN(TsSectionPmt); | 37 DISALLOW_COPY_AND_ASSIGN(TsSectionPmt); |
35 }; | 38 }; |
36 | 39 |
37 } // namespace mp2t | 40 } // namespace mp2t |
38 } // namespace media | 41 } // namespace media |
39 | 42 |
40 #endif | 43 #endif |
41 | 44 |
OLD | NEW |