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

Side by Side Diff: media/formats/mp4/box_reader.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/mp4/box_reader.h" 5 #include "media/formats/mp4/box_reader.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 #include <algorithm> 8 #include <algorithm>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 case FOURCC_MECO: 153 case FOURCC_MECO:
154 case FOURCC_STYP: 154 case FOURCC_STYP:
155 case FOURCC_SIDX: 155 case FOURCC_SIDX:
156 case FOURCC_SSIX: 156 case FOURCC_SSIX:
157 case FOURCC_PRFT: 157 case FOURCC_PRFT:
158 case FOURCC_UUID: 158 case FOURCC_UUID:
159 case FOURCC_EMSG: 159 case FOURCC_EMSG:
160 return true; 160 return true;
161 default: 161 default:
162 // Hex is used to show nonprintable characters and aid in debugging 162 // Hex is used to show nonprintable characters and aid in debugging
163 MEDIA_LOG(log_cb) << "Unrecognized top-level box type " 163 MEDIA_LOG(DEBUG, log_cb) << "Unrecognized top-level box type "
164 << FourCCToString(type); 164 << FourCCToString(type);
165 return false; 165 return false;
166 } 166 }
167 } 167 }
168 168
169 bool BoxReader::ScanChildren() { 169 bool BoxReader::ScanChildren() {
170 DCHECK(!scanned_); 170 DCHECK(!scanned_);
171 scanned_ = true; 171 scanned_ = true;
172 172
173 bool err = false; 173 bool err = false;
174 while (pos() < size()) { 174 while (pos() < size()) {
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 } 239 }
240 240
241 // Note that the pos_ head has advanced to the byte immediately after the 241 // Note that the pos_ head has advanced to the byte immediately after the
242 // header, which is where we want it. 242 // header, which is where we want it.
243 size_ = size; 243 size_ = size;
244 return true; 244 return true;
245 } 245 }
246 246
247 } // namespace mp4 247 } // namespace mp4
248 } // namespace media 248 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698