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

Side by Side Diff: media/mp2t/ts_section_pat.cc

Issue 23566013: Mpeg2 TS stream parser for media source. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup - address comments from patch set #8 Created 7 years, 3 months 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 unified diff | Download patch
OLDNEW
(Empty)
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #include "media/mp2t/ts_section_pat.h"
6
7 #include <vector>
8
9 #include "base/logging.h"
10 #include "media/base/bit_reader.h"
11 #include "media/mp2t/mp2t_common.h"
12
13 namespace media {
14 namespace mp2t {
15
16 TsSectionPat::TsSectionPat(RegisterPmtCb register_pmt_cb)
17 : register_pmt_cb_(register_pmt_cb),
18 version_number_(-1) {
19 }
20
21 TsSectionPat::~TsSectionPat() {
22 }
23
24 bool TsSectionPat::ParsePsiSection(BitReader* bit_reader) {
25 // Read the fixed section length.
26 int table_id;
27 bool section_syntax_indicator;
28 bool dummy_zero;
29 int reserved;
30 int section_length;
31 int transport_stream_id;
32 int version_number;
33 bool current_next_indicator;
34 int section_number;
35 int last_section_number;
36 RCHECK(bit_reader->ReadBits(8, &table_id));
37 RCHECK(bit_reader->ReadBits(1, &section_syntax_indicator));
38 RCHECK(bit_reader->ReadBits(1, &dummy_zero));
39 RCHECK(bit_reader->ReadBits(2, &reserved));
40 RCHECK(bit_reader->ReadBits(12, &section_length));
41 RCHECK(section_length >= 5);
42 RCHECK(bit_reader->ReadBits(16, &transport_stream_id));
43 RCHECK(bit_reader->ReadBits(2, &reserved));
44 RCHECK(bit_reader->ReadBits(5, &version_number));
45 RCHECK(bit_reader->ReadBits(1, &current_next_indicator));
46 RCHECK(bit_reader->ReadBits(8, &section_number));
47 RCHECK(bit_reader->ReadBits(8, &last_section_number));
48 section_length -= 5;
49
50 // Perform a few verifications:
51 // - Table ID should be 0 for a PAT.
52 // - section_syntax_indicator should be one.
53 // - section length should not exceed 1021
54 RCHECK(table_id == 0x0);
55 RCHECK(section_syntax_indicator);
56 RCHECK(!dummy_zero);
57 RCHECK(section_length <= 1021);
acolwell GONE FROM CHROMIUM 2013/09/16 06:19:30 s/1021/1016 to compensate for the -= 5 above?
damienv1 2013/09/17 02:58:22 Good catch. I moved all the RCHECK together in a p
58
59 // Both the program table and the CRC have a size multiple of 4.
60 // Note for pmt_pid_count: minus 4 to account for the CRC.
61 RCHECK((section_length & 0x3) == 0);
acolwell GONE FROM CHROMIUM 2013/09/16 06:19:30 nit: s/& 0x3/% 4/ just to make it easier to see th
damienv1 2013/09/17 02:58:22 Done.
62 int pmt_pid_count = (section_length - 4) / 4;
63
64 // Read the variable length section: program table & crc.
65 std::vector<int> program_number_array(pmt_pid_count);
66 std::vector<int> pmt_pid_array(pmt_pid_count);
67 for (int k = 0; k < pmt_pid_count; k++) {
68 int reserved;
69 RCHECK(bit_reader->ReadBits(16, &program_number_array[k]));
70 RCHECK(bit_reader->ReadBits(3, &reserved));
71 RCHECK(bit_reader->ReadBits(13, &pmt_pid_array[k]));
72 }
73 int crc32;
74 RCHECK(bit_reader->ReadBits(32, &crc32));
75
76 // Just ignore the PAT if not applicable yet.
77 if (!current_next_indicator) {
78 DVLOG(1) << "Not supported: received a PAT not applicable yet";
79 return true;
80 }
81
82 // Ignore the program table if it hasn't changed.
83 if (version_number == version_number_)
84 return true;
85
86 // Both the MSE and the HLS spec specifies that TS streams should convey
87 // exactly one program.
88 if (pmt_pid_count > 1)
89 return false;
acolwell GONE FROM CHROMIUM 2013/09/16 06:19:30 nit: A DVLOG saying multiple programs were detecte
damienv1 2013/09/17 02:58:22 Done.
90
91 // Can now register the PMT.
92 int expected_version_number = version_number;
93 if (version_number_ >= 0)
94 expected_version_number = (version_number_ + 1) % 32;
95 DVLOG_IF(1, version_number != expected_version_number)
96 << "Unexpected version number: "
97 << version_number << " vs " << version_number_;
98 for (int k = 0; k < pmt_pid_count; k++) {
99 if (program_number_array[k] != 0) {
100 // Program numbers different from 0 correspond to PMT.
101 register_pmt_cb_.Run(program_number_array[k], pmt_pid_array[k]);
102 // Even if there are multiple programs, only one can be supported now.
103 // HLS: "Transport Stream segments MUST contain a single MPEG-2 Program."
104 break;
105 }
106 }
107 version_number_ = version_number;
108
109 return true;
110 }
111
112 void TsSectionPat::ResetPsiSection() {
113 version_number_ = -1;
114 }
115
116 } // namespace mp2t
117 } // namespace media
118
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698