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

Side by Side Diff: media/formats/mpeg/mpeg1_audio_stream_parser.cc

Issue 1041353002: media-internals: Differentiate error, info, and debug log messages (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address reviewer comments Created 5 years, 8 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
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 #include "media/formats/mpeg/mpeg1_audio_stream_parser.h" 5 #include "media/formats/mpeg/mpeg1_audio_stream_parser.h"
6 6
7 namespace media { 7 namespace media {
8 8
9 static const uint32 kMPEG1StartCodeMask = 0xffe00000; 9 static const uint32 kMPEG1StartCodeMask = 0xffe00000;
10 10
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 << " layer 0x" << layer 121 << " layer 0x" << layer
122 << " bitrate_index 0x" << bitrate_index 122 << " bitrate_index 0x" << bitrate_index
123 << " sample_rate_index 0x" << sample_rate_index 123 << " sample_rate_index 0x" << sample_rate_index
124 << " channel_mode 0x" << channel_mode; 124 << " channel_mode 0x" << channel_mode;
125 125
126 if (sync != 0x7ff || 126 if (sync != 0x7ff ||
127 version == kVersionReserved || 127 version == kVersionReserved ||
128 layer == kLayerReserved || 128 layer == kLayerReserved ||
129 bitrate_index == kBitrateFree || bitrate_index == kBitrateBad || 129 bitrate_index == kBitrateFree || bitrate_index == kBitrateBad ||
130 sample_rate_index == kSampleRateReserved) { 130 sample_rate_index == kSampleRateReserved) {
131 MEDIA_LOG(log_cb) << "Invalid header data :" << std::hex 131 MEDIA_LOG(ERROR, log_cb)
132 << " sync 0x" << sync 132 << "Invalid header data :" << std::hex << " sync 0x" << sync
133 << " version 0x" << version 133 << " version 0x" << version << " layer 0x" << layer
134 << " layer 0x" << layer 134 << " bitrate_index 0x" << bitrate_index << " sample_rate_index 0x"
135 << " bitrate_index 0x" << bitrate_index 135 << sample_rate_index << " channel_mode 0x" << channel_mode;
136 << " sample_rate_index 0x" << sample_rate_index
137 << " channel_mode 0x" << channel_mode;
138 return false; 136 return false;
139 } 137 }
140 138
141 if (layer == kLayer2 && kIsAllowed[bitrate_index][channel_mode]) { 139 if (layer == kLayer2 && kIsAllowed[bitrate_index][channel_mode]) {
142 MEDIA_LOG(log_cb) << "Invalid (bitrate_index, channel_mode) combination :" 140 MEDIA_LOG(ERROR, log_cb) << "Invalid (bitrate_index, channel_mode)"
143 << std::hex 141 << " combination :" << std::hex
144 << " bitrate_index " << bitrate_index 142 << " bitrate_index " << bitrate_index
145 << " channel_mode " << channel_mode; 143 << " channel_mode " << channel_mode;
146 return false; 144 return false;
147 } 145 }
148 146
149 int bitrate = kBitrateMap[bitrate_index][kVersionLayerMap[version][layer]]; 147 int bitrate = kBitrateMap[bitrate_index][kVersionLayerMap[version][layer]];
150 148
151 if (bitrate == 0) { 149 if (bitrate == 0) {
152 MEDIA_LOG(log_cb) << "Invalid bitrate :" << std::hex 150 MEDIA_LOG(ERROR, log_cb) << "Invalid bitrate :" << std::hex << " version "
153 << " version " << version 151 << version << " layer " << layer
154 << " layer " << layer 152 << " bitrate_index " << bitrate_index;
155 << " bitrate_index " << bitrate_index;
156 return false; 153 return false;
157 } 154 }
158 155
159 DVLOG(2) << " bitrate " << bitrate; 156 DVLOG(2) << " bitrate " << bitrate;
160 157
161 int frame_sample_rate = kSampleRateMap[sample_rate_index][version]; 158 int frame_sample_rate = kSampleRateMap[sample_rate_index][version];
162 if (frame_sample_rate == 0) { 159 if (frame_sample_rate == 0) {
163 MEDIA_LOG(log_cb) << "Invalid sample rate :" << std::hex 160 MEDIA_LOG(ERROR, log_cb) << "Invalid sample rate :" << std::hex
164 << " version " << version 161 << " version " << version << " sample_rate_index "
165 << " sample_rate_index " << sample_rate_index; 162 << sample_rate_index;
166 return false; 163 return false;
167 } 164 }
168 header->sample_rate = frame_sample_rate; 165 header->sample_rate = frame_sample_rate;
169 166
170 // http://teslabs.com/openplayer/docs/docs/specs/mp3_structure2.pdf 167 // http://teslabs.com/openplayer/docs/docs/specs/mp3_structure2.pdf
171 // Table 2.1.5 168 // Table 2.1.5
172 int samples_per_frame; 169 int samples_per_frame;
173 switch (layer) { 170 switch (layer) {
174 case kLayer1: 171 case kLayer1:
175 samples_per_frame = 384; 172 samples_per_frame = 384;
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 // If we don't have enough data available to check, return 0 so frame parsing 268 // If we don't have enough data available to check, return 0 so frame parsing
272 // will be retried once more data is available. 269 // will be retried once more data is available.
273 BitReader reader(data + header_bytes_read, size - header_bytes_read); 270 BitReader reader(data + header_bytes_read, size - header_bytes_read);
274 if (!reader.SkipBits(xing_header_index * 8) || 271 if (!reader.SkipBits(xing_header_index * 8) ||
275 !reader.ReadBits(sizeof(tag) * 8, &tag)) { 272 !reader.ReadBits(sizeof(tag) * 8, &tag)) {
276 return 0; 273 return 0;
277 } 274 }
278 275
279 // Check to see if the tag contains 'Xing' or 'Info' 276 // Check to see if the tag contains 'Xing' or 'Info'
280 if (tag == 0x496e666f || tag == 0x58696e67) { 277 if (tag == 0x496e666f || tag == 0x58696e67) {
281 MEDIA_LOG(log_cb()) << "Skipping XING header."; 278 MEDIA_LOG(DEBUG, log_cb()) << "Skipping XING header.";
282 if (metadata_frame) 279 if (metadata_frame)
283 *metadata_frame = true; 280 *metadata_frame = true;
284 return header_bytes_read + reader.bits_read() / 8; 281 return header_bytes_read + reader.bits_read() / 8;
285 } 282 }
286 283
287 // If it wasn't a XING frame, just return the number consumed bytes. 284 // If it wasn't a XING frame, just return the number consumed bytes.
288 return header_bytes_read; 285 return header_bytes_read;
289 } 286 }
290 287
291 } // namespace media 288 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698