Add MediaError.message

media/base/media_log.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/base/media_log.h"
 
 #include <utility>
 
 #include "base/atomic_sequence_num.h"
 #include "base/json/json_writer.h"
@@ skipping 190 matching lines @@
       return "chunk demuxer: application requested decode error on eos";
     case CHUNK_DEMUXER_ERROR_EOS_STATUS_NETWORK_ERROR:
       return "chunk demuxer: application requested network error on eos";
     case AUDIO_RENDERER_ERROR:
       return "audio renderer: output device reported an error";
   }
   NOTREACHED();
   return NULL;
 }
 
-std::string MediaLog::MediaEventToLogString(const MediaLogEvent& event) {
+std::string MediaLog::MediaEventToLogString(const MediaLogEvent& event,
+                                            bool include_type) {

[sandersd (OOO until July 31), 2017/04/12 01:09:38]

Not a fan of this parameter, it's not clear from context what it does at the
call sites. This is a case where two methods makes more sense.

[wolenetz, 2017/04/13 23:59:10]

Done.

   // Special case for PIPELINE_ERROR, since that's by far the most useful
   // event for figuring out media pipeline failures, and just reporting
   // pipeline status as numeric code is not very helpful/user-friendly.
   int error_code = 0;
   if (event.type == MediaLogEvent::PIPELINE_ERROR &&
       event.params.GetInteger("pipeline_error", &error_code)) {
     PipelineStatus status = static_cast<PipelineStatus>(error_code);
-    return EventTypeToString(event.type) + " " + PipelineStatusToString(status);
+    if (include_type) {
+      return EventTypeToString(event.type) + " " +
+             PipelineStatusToString(status);
+    }
+    return PipelineStatusToString(status);
   }
+
   std::string params_json;
   base::JSONWriter::Write(event.params, &params_json);
-  return EventTypeToString(event.type) + " " + params_json;
+  if (include_type)
+    return EventTypeToString(event.type) + " " + params_json;
+  return params_json;
 }
 
 std::string MediaLog::BufferingStateToString(BufferingState state) {
   switch (state) {
     case BUFFERING_HAVE_NOTHING:
       return "BUFFERING_HAVE_NOTHING";
     case BUFFERING_HAVE_ENOUGH:
       return "BUFFERING_HAVE_ENOUGH";
   }
   NOTREACHED();
   return "";
 }
 
 MediaLog::MediaLog() : id_(g_media_log_count.GetNext()) {}
 
 MediaLog::~MediaLog() {}
 
 void MediaLog::AddEvent(std::unique_ptr<MediaLogEvent> event) {}
 
-std::string MediaLog::GetLastErrorMessage() {
-  return "";
+std::map<std::string, std::vector<std::string>> MediaLog::GetErrorMessages() {
+  return std::map<std::string, std::vector<std::string>>();
 }
 
 void MediaLog::RecordRapporWithSecurityOrigin(const std::string& metric) {
   DVLOG(1) << "Default MediaLog doesn't support rappor reporting.";
 }
 
 std::unique_ptr<MediaLogEvent> MediaLog::CreateEvent(MediaLogEvent::Type type) {
   std::unique_ptr<MediaLogEvent> event(new MediaLogEvent);
   event->id = id_;
   event->type = type;
@@ skipping 127 matching lines @@
                      const scoped_refptr<MediaLog>& media_log)
     : level_(level), media_log_(media_log) {
   DCHECK(media_log_.get());
 }
 
 LogHelper::~LogHelper() {
   media_log_->AddLogEvent(level_, stream_.str());
 }
 
 }  //namespace media