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

Unified Diff: media/formats/mpeg/mpeg_audio_stream_parser_base.cc

Issue 1235793005: Deprecate LogCB in favor of using MediaLog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments and attempt to fix Android compilation Created 5 years, 5 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
« no previous file with comments | « media/formats/mpeg/mpeg_audio_stream_parser_base.h ('k') | media/formats/webm/webm_audio_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/formats/mpeg/mpeg_audio_stream_parser_base.cc
diff --git a/media/formats/mpeg/mpeg_audio_stream_parser_base.cc b/media/formats/mpeg/mpeg_audio_stream_parser_base.cc
index 14fe143c79184002463a19989c9c6c778eb03d87..c79724d6fdc2490c631a14a24bb562559c76b12c 100644
--- a/media/formats/mpeg/mpeg_audio_stream_parser_base.cc
+++ b/media/formats/mpeg/mpeg_audio_stream_parser_base.cc
@@ -62,7 +62,7 @@ void MPEGAudioStreamParserBase::Init(
const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
const NewMediaSegmentCB& new_segment_cb,
const base::Closure& end_of_segment_cb,
- const LogCB& log_cb) {
+ const scoped_refptr<MediaLog>& media_log) {
DVLOG(1) << __FUNCTION__;
DCHECK_EQ(state_, UNINITIALIZED);
init_cb_ = init_cb;
@@ -70,7 +70,7 @@ void MPEGAudioStreamParserBase::Init(
new_buffers_cb_ = new_buffers_cb;
new_segment_cb_ = new_segment_cb;
end_of_segment_cb_ = end_of_segment_cb;
- log_cb_ = log_cb;
+ media_log_ = media_log;
ChangeState(INITIALIZED);
}
@@ -262,7 +262,7 @@ int MPEGAudioStreamParserBase::ParseIcecastHeader(const uint8* data, int size) {
int offset = LocateEndOfHeaders(data, locate_size, 4);
if (offset < 0) {
if (locate_size == kMaxIcecastHeaderSize) {
- MEDIA_LOG(ERROR, log_cb_) << "Icecast header is too large.";
+ MEDIA_LOG(ERROR, media_log_) << "Icecast header is too large.";
return -1;
}
@@ -323,7 +323,7 @@ bool MPEGAudioStreamParserBase::ParseSyncSafeInt(BitReader* reader,
for (int i = 0; i < 4; ++i) {
uint8 tmp;
if (!reader->ReadBits(1, &tmp) || tmp != 0) {
- MEDIA_LOG(ERROR, log_cb_) << "ID3 syncsafe integer byte MSb is not 0!";
+ MEDIA_LOG(ERROR, media_log_) << "ID3 syncsafe integer byte MSb is not 0!";
return false;
}
« no previous file with comments | « media/formats/mpeg/mpeg_audio_stream_parser_base.h ('k') | media/formats/webm/webm_audio_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698