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 #include "media/formats/mpeg/mpeg1_audio_stream_parser.h" | 5 #include "media/formats/mpeg/mpeg1_audio_stream_parser.h" |
6 | 6 |
7 #include "media/base/media_log.h" | 7 #include "media/base/media_log.h" |
8 | 8 |
9 namespace media { | 9 namespace media { |
10 | 10 |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 bitrate_index == kBitrateFree || bitrate_index == kBitrateBad || | 131 bitrate_index == kBitrateFree || bitrate_index == kBitrateBad || |
132 sample_rate_index == kSampleRateReserved) { | 132 sample_rate_index == kSampleRateReserved) { |
133 MEDIA_LOG(ERROR, media_log) | 133 MEDIA_LOG(ERROR, media_log) |
134 << "Invalid header data :" << std::hex << " sync 0x" << sync | 134 << "Invalid header data :" << std::hex << " sync 0x" << sync |
135 << " version 0x" << version << " layer 0x" << layer | 135 << " version 0x" << version << " layer 0x" << layer |
136 << " bitrate_index 0x" << bitrate_index << " sample_rate_index 0x" | 136 << " bitrate_index 0x" << bitrate_index << " sample_rate_index 0x" |
137 << sample_rate_index << " channel_mode 0x" << channel_mode; | 137 << sample_rate_index << " channel_mode 0x" << channel_mode; |
138 return false; | 138 return false; |
139 } | 139 } |
140 | 140 |
141 if (layer == kLayer2 && kIsAllowed[bitrate_index][channel_mode]) { | 141 if (layer == kLayer2 && !kIsAllowed[bitrate_index][channel_mode]) { |
142 MEDIA_LOG(ERROR, media_log) << "Invalid (bitrate_index, channel_mode)" | 142 MEDIA_LOG(ERROR, media_log) << "Invalid (bitrate_index, channel_mode)" |
143 << " combination :" << std::hex | 143 << " combination :" << std::hex |
144 << " bitrate_index " << bitrate_index | 144 << " bitrate_index " << bitrate_index |
145 << " channel_mode " << channel_mode; | 145 << " channel_mode " << channel_mode; |
146 return false; | 146 return false; |
147 } | 147 } |
148 | 148 |
149 int bitrate = kBitrateMap[bitrate_index][kVersionLayerMap[version][layer]]; | 149 int bitrate = kBitrateMap[bitrate_index][kVersionLayerMap[version][layer]]; |
150 | 150 |
151 if (bitrate == 0) { | 151 if (bitrate == 0) { |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
283 if (metadata_frame) | 283 if (metadata_frame) |
284 *metadata_frame = true; | 284 *metadata_frame = true; |
285 return header_bytes_read + reader.bits_read() / 8; | 285 return header_bytes_read + reader.bits_read() / 8; |
286 } | 286 } |
287 | 287 |
288 // If it wasn't a XING frame, just return the number consumed bytes. | 288 // If it wasn't a XING frame, just return the number consumed bytes. |
289 return header_bytes_read; | 289 return header_bytes_read; |
290 } | 290 } |
291 | 291 |
292 } // namespace media | 292 } // namespace media |
OLD | NEW |