Log MediaSource parsing errors to the MediaLog so they can appear in chrome:media-internals.

media/webm/webm_stream_parser.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/webm/webm_stream_parser.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/logging.h"
@@ skipping 168 matching lines @@
 }
 
 WebMStreamParser::~WebMStreamParser() {}
 
 void WebMStreamParser::Init(const InitCB& init_cb,
                             const NewConfigCB& config_cb,
                             const NewBuffersCB& audio_cb,
                             const NewBuffersCB& video_cb,
                             const NeedKeyCB& need_key_cb,
                             const NewMediaSegmentCB& new_segment_cb,
-                            const base::Closure& end_of_segment_cb) {
+                            const base::Closure& end_of_segment_cb,
+                            const LogCB& log_cb) {
   DCHECK_EQ(state_, kWaitingForInit);
   DCHECK(init_cb_.is_null());
   DCHECK(!init_cb.is_null());
   DCHECK(!config_cb.is_null());
   DCHECK(!audio_cb.is_null() || !video_cb.is_null());
   DCHECK(!need_key_cb.is_null());
   DCHECK(!new_segment_cb.is_null());
   DCHECK(!end_of_segment_cb.is_null());
 
   ChangeState(kParsingHeaders);
   init_cb_ = init_cb;
   config_cb_ = config_cb;
   audio_cb_ = audio_cb;
   video_cb_ = video_cb;
   need_key_cb_ = need_key_cb;
   new_segment_cb_ = new_segment_cb;
   end_of_segment_cb_ = end_of_segment_cb;
+  log_cb_ = log_cb;
 }
 
 void WebMStreamParser::Flush() {
   DCHECK_NE(state_, kWaitingForInit);
 
   byte_queue_.Reset();
 
   if (state_ != kParsingClusters)
     return;
 
@@ skipping 81 matching lines @@
       // Skip the element.
       return result + element_size;
       break;
     case kWebMIdSegment:
       // Just consume the segment header.
       return result;
       break;
     case kWebMIdInfo:
       // We've found the element we are looking for.
       break;
-    default:
-      DVLOG(1) << "Unexpected ID 0x" << std::hex << id;
+    default: {
+      MEDIA_LOG(log_cb_) << "Unexpected element ID 0x" << std::hex << id;
       return -1;
+    }
   }
 
   WebMInfoParser info_parser;
   result = info_parser.Parse(cur, cur_size);
 
   if (result <= 0)
     return result;
 
   cur += result;
   cur_size -= result;
   bytes_parsed += result;
 
-  WebMTracksParser tracks_parser;
+  WebMTracksParser tracks_parser(log_cb_);
   result = tracks_parser.Parse(cur, cur_size);
 
   if (result <= 0)
     return result;
 
   bytes_parsed += result;
 
   base::TimeDelta duration = kInfiniteDuration();
 
   if (info_parser.duration() > 0) {
@@ skipping 52 matching lines @@
   if (!config_cb_.Run(audio_config, video_config)) {
     DVLOG(1) << "New config data isn't allowed.";
     return -1;
   }
 
   cluster_parser_.reset(new WebMClusterParser(
       info_parser.timecode_scale(),
       tracks_parser.audio_track_num(),
       tracks_parser.video_track_num(),
       tracks_parser.audio_encryption_key_id(),
-      tracks_parser.video_encryption_key_id()));
+      tracks_parser.video_encryption_key_id(),
+      log_cb_));
 
   ChangeState(kParsingClusters);
 
   if (!init_cb_.is_null()) {
     init_cb_.Run(true, duration);
     init_cb_.Reset();
   }
 
   return bytes_parsed;
 }
@@ skipping 55 matching lines @@
 
 void WebMStreamParser::FireNeedKey(const std::string& key_id) {
   int key_id_size = key_id.size();
   DCHECK_GT(key_id_size, 0);
   scoped_array<uint8> key_id_array(new uint8[key_id_size]);
   memcpy(key_id_array.get(), key_id.data(), key_id_size);
   need_key_cb_.Run(kWebMInitDataType, key_id_array.Pass(), key_id_size);
 }
 
 }  // namespace media