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

Side by Side Diff: media/mpeg2/mpeg2ts_pat.cc

Issue 23566013: Mpeg2 TS stream parser for media source. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/mpeg2/mpeg2ts_pat.h"
6
7 #include "base/logging.h"
8 #include "media/base/bit_reader.h"
9 #include "media/mpeg2/mpeg2ts_common.h"
10
11 namespace media {
12 namespace mpeg2ts {
13
14 Mpeg2TsPatParser::Mpeg2TsPatParser(RegisterPmtCb register_pmt_cb)
15 : register_pmt_cb_(register_pmt_cb),
16 version_number_(-1) {
17 }
18
19 Mpeg2TsPatParser::~Mpeg2TsPatParser() {
20 }
21
22 bool Mpeg2TsPatParser::ParsePsiSection(BitReader* bit_reader) {
23 // Read the fixed section length.
24 int remaining_size = bit_reader->bits_available() / 8;
25 if (remaining_size < 8) {
26 LOG(WARNING) << "remaining_size=" << remaining_size;
acolwell GONE FROM CHROMIUM 2013/09/05 18:29:10 nit: DVLOG
damienv1 2013/09/09 23:29:45 Done.
27 return false;
28 }
29 int table_id;
30 DCHECK(bit_reader->ReadBits(8, &table_id));
31 bool section_syntax_indicator;
acolwell GONE FROM CHROMIUM 2013/09/05 18:29:10 nit: put all declarations together to make this ea
damienv1 2013/09/09 23:29:45 Done.
32 DCHECK(bit_reader->ReadBits(1, &section_syntax_indicator));
acolwell GONE FROM CHROMIUM 2013/09/05 18:29:10 These should be RCHECK otherwise these won't run i
damienv1 2013/09/09 23:29:45 Running this is safe in release builds: I just che
acolwell GONE FROM CHROMIUM 2013/09/12 19:59:50 But none of the code in a DCHECK runs in a release
damienv1 2013/09/12 20:53:51 OK, my mistake. If we had to use DCHECK, it would
33 bool dummy_zero;
34 DCHECK(bit_reader->ReadBits(1, &dummy_zero));
35 int reserved;
36 DCHECK(bit_reader->ReadBits(2, &reserved));
37 int section_length;
38 DCHECK(bit_reader->ReadBits(12, &section_length));
39 int transport_stream_id;
40 DCHECK(bit_reader->ReadBits(16, &transport_stream_id));
41 DCHECK(bit_reader->ReadBits(2, &reserved));
42 int version_number;
43 DCHECK(bit_reader->ReadBits(5, &version_number));
44 bool current_next_indicator;
45 DCHECK(bit_reader->ReadBits(1, &current_next_indicator));
46 int section_number;
47 DCHECK(bit_reader->ReadBits(8, &section_number));
48 int last_section_number;
49 DCHECK(bit_reader->ReadBits(8, &last_section_number));
50 section_length -= 5;
51
52 // Perform a few verifications:
53 // - Table ID should be 0 for a PAT.
54 // - section_syntax_indicator should be one.
55 // - section length should not exceed 1021
56 RCHECK(table_id == 0x0);
57 RCHECK(section_syntax_indicator);
58 RCHECK(!dummy_zero);
59 RCHECK(section_length <= 1021);
60
61 // Make sure there are enough bits for the variable section.
62 remaining_size = bit_reader->bits_available() / 8;
63 if (remaining_size < section_length) {
64 LOG(WARNING) << "remaining_size=" << remaining_size;
acolwell GONE FROM CHROMIUM 2013/09/05 18:29:10 DVLOG here and all cases below.
damienv1 2013/09/09 23:29:45 Done.
65 return false;
66 }
67 LOG_IF(WARNING, remaining_size > section_length)
68 << "Trailing bytes after the PAT: nbytes="
69 << (remaining_size - section_length);
70
71 // Both the program table and the CRC have a size multiple of 4.
72 // Note for pmt_pid_count: minus 4 to account for the CRC.
73 if ((section_length & 0x3) != 0) {
74 LOG(WARNING) << "PAT table size should be a multiple of 4";
75 return false;
76 }
77 int pmt_pid_count = (section_length - 4) / 4;
78
79 // Read the variable length section: program table & crc.
80 std::vector<int> program_number_array(pmt_pid_count);
81 std::vector<int> pmt_pid_array(pmt_pid_count);
82 for (int k = 0; k < pmt_pid_count; k++) {
83 DCHECK(bit_reader->ReadBits(16, &program_number_array[k]));
acolwell GONE FROM CHROMIUM 2013/09/05 18:29:10 RCHECK here and below
damienv1 2013/09/09 23:29:45 By design, we should not run out of bits in this s
84 int reserved;
85 DCHECK(bit_reader->ReadBits(3, &reserved));
acolwell GONE FROM CHROMIUM 2013/09/05 18:29:10 RCHECK reserved value
damienv1 2013/09/09 23:29:45 Ditto.
86 DCHECK(bit_reader->ReadBits(13, &pmt_pid_array[k]));
87 }
88 int crc32;
89 DCHECK(bit_reader->ReadBits(32, &crc32));
90
91 // Just ignore the PAT if not applicable yet.
92 if (!current_next_indicator) {
93 LOG(WARNING) << "Not supported: received a PAT not applicable yet";
94 return true;
95 }
96
97 // Ignore the program table if it hasn't changed.
98 if (version_number == version_number_) {
acolwell GONE FROM CHROMIUM 2013/09/05 18:29:10 nit: remove {}
damienv1 2013/09/09 23:29:45 Done.
99 return true;
100 }
101
102 // Can now register the PMT.
103 int expected_version_number = version_number;
104 if (version_number_ >= 0) {
105 expected_version_number = (version_number_ + 1) % 32;
106 }
107 LOG_IF(WARNING, version_number != expected_version_number)
108 << "Unexpected version number: "
109 << version_number << " vs " << version_number_;
110 for (int k = 0; k < pmt_pid_count; k++) {
111 if (program_number_array[k] != 0) {
112 // Program numbers different from 0 correspond to PMT.
113 register_pmt_cb_.Run(program_number_array[k], pmt_pid_array[k]);
114 // Even if there are multiple programs, only one can be supported now.
115 // HLS: "Transport Stream segments MUST contain a single MPEG-2 Program."
acolwell GONE FROM CHROMIUM 2013/09/05 18:29:10 If this code is detecting multiple programs here,
damienv1 2013/09/09 23:29:45 Done.
116 break;
117 }
118 }
119 version_number_ = version_number;
120
121 return true;
122 }
123
124 } // namespace mpeg2ts
125 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698