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

Unified 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, 9 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 side-by-side diff with in-line comments
Download patch
Index: media/formats/mpeg/mpeg1_audio_stream_parser.cc
diff --git a/media/formats/mpeg/mpeg1_audio_stream_parser.cc b/media/formats/mpeg/mpeg1_audio_stream_parser.cc
index 92bd4ce104e0afcd057b2b34bb7583db47c22ff7..204ee732fcedae21957c7fabadf6e5bb02353a42 100644
--- a/media/formats/mpeg/mpeg1_audio_stream_parser.cc
+++ b/media/formats/mpeg/mpeg1_audio_stream_parser.cc
@@ -128,31 +128,28 @@ bool MPEG1AudioStreamParser::ParseHeader(
layer == kLayerReserved ||
bitrate_index == kBitrateFree || bitrate_index == kBitrateBad ||
sample_rate_index == kSampleRateReserved) {
- MEDIA_LOG(log_cb) << "Invalid header data :" << std::hex
- << " sync 0x" << sync
- << " version 0x" << version
- << " layer 0x" << layer
- << " bitrate_index 0x" << bitrate_index
- << " sample_rate_index 0x" << sample_rate_index
- << " channel_mode 0x" << channel_mode;
+ MEDIA_LOG(ERROR, log_cb)
+ << "Invalid header data :" << std::hex << " sync 0x" << sync
+ << " version 0x" << version << " layer 0x" << layer
+ << " bitrate_index 0x" << bitrate_index << " sample_rate_index 0x"
+ << sample_rate_index << " channel_mode 0x" << channel_mode;
return false;
}
if (layer == kLayer2 && kIsAllowed[bitrate_index][channel_mode]) {
- MEDIA_LOG(log_cb) << "Invalid (bitrate_index, channel_mode) combination :"
- << std::hex
- << " bitrate_index " << bitrate_index
- << " channel_mode " << channel_mode;
+ MEDIA_LOG(ERROR, log_cb) << "Invalid (bitrate_index, channel_mode)"
+ << " combination :" << std::hex
+ << " bitrate_index " << bitrate_index
+ << " channel_mode " << channel_mode;
return false;
}
int bitrate = kBitrateMap[bitrate_index][kVersionLayerMap[version][layer]];
if (bitrate == 0) {
- MEDIA_LOG(log_cb) << "Invalid bitrate :" << std::hex
- << " version " << version
- << " layer " << layer
- << " bitrate_index " << bitrate_index;
+ MEDIA_LOG(ERROR, log_cb) << "Invalid bitrate :" << std::hex << " version "
+ << version << " layer " << layer
+ << " bitrate_index " << bitrate_index;
return false;
}
@@ -160,9 +157,9 @@ bool MPEG1AudioStreamParser::ParseHeader(
int frame_sample_rate = kSampleRateMap[sample_rate_index][version];
if (frame_sample_rate == 0) {
- MEDIA_LOG(log_cb) << "Invalid sample rate :" << std::hex
- << " version " << version
- << " sample_rate_index " << sample_rate_index;
+ MEDIA_LOG(ERROR, log_cb) << "Invalid sample rate :" << std::hex
+ << " version " << version << " sample_rate_index "
+ << sample_rate_index;
return false;
}
header->sample_rate = frame_sample_rate;
@@ -278,7 +275,7 @@ int MPEG1AudioStreamParser::ParseFrameHeader(const uint8* data,
// Check to see if the tag contains 'Xing' or 'Info'
if (tag == 0x496e666f || tag == 0x58696e67) {
- MEDIA_LOG(log_cb()) << "Skipping XING header.";
+ MEDIA_LOG(DEBUG, log_cb()) << "Skipping XING header.";
if (metadata_frame)
*metadata_frame = true;
return header_bytes_read + reader.bits_read() / 8;

Powered by Google App Engine
This is Rietveld 408576698