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

media/webm/webm_content_encodings_client.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_content_encodings_client.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "media/webm/webm_constants.h"
 
 namespace media {
 
-WebMContentEncodingsClient::WebMContentEncodingsClient()
-    : content_encryption_encountered_(false),
+WebMContentEncodingsClient::WebMContentEncodingsClient(
+    const ErrorLogCB& error_cb)
+    : error_cb_(error_cb),
+      content_encryption_encountered_(false),
       content_encodings_ready_(false) {
 }
 
 WebMContentEncodingsClient::~WebMContentEncodingsClient() {
   STLDeleteElements(&content_encodings_);
 }
 
 const ContentEncodings& WebMContentEncodingsClient::content_encodings() const {
   DCHECK(content_encodings_ready_);
   return content_encodings_;
@@ skipping 11 matching lines @@
   if (id == kWebMIdContentEncoding) {
     DCHECK(!cur_content_encoding_.get());
     DCHECK(!content_encryption_encountered_);
     cur_content_encoding_.reset(new ContentEncoding());
     return this;
   }
 
   if (id == kWebMIdContentEncryption) {
     DCHECK(cur_content_encoding_.get());
     if (content_encryption_encountered_) {
-      DVLOG(1) << "Unexpected multiple ContentEncryption.";
+      ERROR_LOG(error_cb_) << "Unexpected multiple ContentEncryption.";
       return NULL;
     }
     content_encryption_encountered_ = true;
     return this;
   }
 
   if (id == kWebMIdContentEncAESSettings) {
     DCHECK(cur_content_encoding_.get());
     return this;
   }
 
   // This should not happen if WebMListParser is working properly.
   DCHECK(false);
   return NULL;
 }
 
 // Mandatory occurrence restriction is checked in this function. Multiple
 // occurrence restriction is checked in OnUInt and OnBinary.
 bool WebMContentEncodingsClient::OnListEnd(int id) {
   if (id == kWebMIdContentEncodings) {
     // ContentEncoding element is mandatory. Check this!
     if (content_encodings_.empty()) {
-      DVLOG(1) << "Missing ContentEncoding.";
+      ERROR_LOG(error_cb_) << "Missing ContentEncoding.";
       return false;
     }
     content_encodings_ready_ = true;
     return true;
   }
 
   if (id == kWebMIdContentEncoding) {
     DCHECK(cur_content_encoding_.get());
 
     //
     // Specify default values to missing mandatory elements.
     //
 
     if (cur_content_encoding_->order() == ContentEncoding::kOrderInvalid) {
       // Default value of encoding order is 0, which should only be used on the
       // first ContentEncoding.
       if (!content_encodings_.empty()) {
-        DVLOG(1) << "Missing ContentEncodingOrder.";
+        ERROR_LOG(error_cb_) << "Missing ContentEncodingOrder.";
         return false;
       }
       cur_content_encoding_->set_order(0);
     }
 
     if (cur_content_encoding_->scope() == ContentEncoding::kScopeInvalid)
       cur_content_encoding_->set_scope(ContentEncoding::kScopeAllFrameContents);
 
     if (cur_content_encoding_->type() == ContentEncoding::kTypeInvalid)
       cur_content_encoding_->set_type(ContentEncoding::kTypeCompression);
 
     // Check for elements valid in spec but not supported for now.
     if (cur_content_encoding_->type() == ContentEncoding::kTypeCompression) {
-      DVLOG(1) << "ContentCompression not supported.";
+      ERROR_LOG(error_cb_) << "ContentCompression not supported.";
       return false;
     }
 
     // Enforce mandatory elements without default values.
     DCHECK(cur_content_encoding_->type() == ContentEncoding::kTypeEncryption);
     if (!content_encryption_encountered_) {
-      DVLOG(1) << "ContentEncodingType is encryption but ContentEncryption "
-                  "is missing.";
+      ERROR_LOG(error_cb_) << "ContentEncodingType is encryption but"
+                           << " ContentEncryption is missing.";
       return false;
     }
 
     content_encodings_.push_back(cur_content_encoding_.release());
     content_encryption_encountered_ = false;
     return true;
   }
 
   if (id == kWebMIdContentEncryption) {
     DCHECK(cur_content_encoding_.get());
@@ skipping 18 matching lines @@
   return false;
 }
 
 // Multiple occurrence restriction and range are checked in this function.
 // Mandatory occurrence restriction is checked in OnListEnd.
 bool WebMContentEncodingsClient::OnUInt(int id, int64 val) {
   DCHECK(cur_content_encoding_.get());
 
   if (id == kWebMIdContentEncodingOrder) {
     if (cur_content_encoding_->order() != ContentEncoding::kOrderInvalid) {
-      DVLOG(1) << "Unexpected multiple ContentEncodingOrder.";
+      ERROR_LOG(error_cb_) << "Unexpected multiple ContentEncodingOrder.";
       return false;
     }
 
     if (val != static_cast<int64>(content_encodings_.size())) {
       // According to the spec, encoding order starts with 0 and counts upwards.
-      DVLOG(1) << "Unexpected ContentEncodingOrder.";
+      ERROR_LOG(error_cb_) << "Unexpected ContentEncodingOrder.";
       return false;
     }
 
     cur_content_encoding_->set_order(val);
     return true;
   }
 
   if (id == kWebMIdContentEncodingScope) {
     if (cur_content_encoding_->scope() != ContentEncoding::kScopeInvalid) {
-      DVLOG(1) << "Unexpected multiple ContentEncodingScope.";
+      ERROR_LOG(error_cb_) << "Unexpected multiple ContentEncodingScope.";
       return false;
     }
 
     if (val == ContentEncoding::kScopeInvalid ||
         val > ContentEncoding::kScopeMax) {
-      DVLOG(1) << "Unexpected ContentEncodingScope.";
+      ERROR_LOG(error_cb_) << "Unexpected ContentEncodingScope.";
       return false;
     }
 
     if (val & ContentEncoding::kScopeNextContentEncodingData) {
-      DVLOG(1) << "Encoded next ContentEncoding is not supported.";
+      ERROR_LOG(error_cb_) << "Encoded next ContentEncoding is not supported.";
       return false;
     }
 
     cur_content_encoding_->set_scope(static_cast<ContentEncoding::Scope>(val));
     return true;
   }
 
   if (id == kWebMIdContentEncodingType) {
     if (cur_content_encoding_->type() != ContentEncoding::kTypeInvalid) {
-      DVLOG(1) << "Unexpected multiple ContentEncodingType.";
+      ERROR_LOG(error_cb_) << "Unexpected multiple ContentEncodingType.";
       return false;
     }
 
     if (val == ContentEncoding::kTypeCompression) {
-      DVLOG(1) << "ContentCompression not supported.";
+      ERROR_LOG(error_cb_) << "ContentCompression not supported.";
       return false;
     }
 
     if (val != ContentEncoding::kTypeEncryption) {
-      DVLOG(1) << "Unexpected ContentEncodingType " << val << ".";
+      ERROR_LOG(error_cb_) << "Unexpected ContentEncodingType " << val << ".";
       return false;
     }
 
     cur_content_encoding_->set_type(static_cast<ContentEncoding::Type>(val));
     return true;
   }
 
   if (id == kWebMIdContentEncAlgo) {
     if (cur_content_encoding_->encryption_algo() !=
         ContentEncoding::kEncAlgoInvalid) {
-      DVLOG(1) << "Unexpected multiple ContentEncAlgo.";
+      ERROR_LOG(error_cb_) << "Unexpected multiple ContentEncAlgo.";
       return false;
     }
 
     if (val < ContentEncoding::kEncAlgoNotEncrypted ||
         val > ContentEncoding::kEncAlgoAes) {
-      DVLOG(1) << "Unexpected ContentEncAlgo " << val << ".";
+      ERROR_LOG(error_cb_) << "Unexpected ContentEncAlgo " << val << ".";
       return false;
     }
 
     cur_content_encoding_->set_encryption_algo(
         static_cast<ContentEncoding::EncryptionAlgo>(val));
     return true;
   }
 
   if (id == kWebMIdAESSettingsCipherMode) {
     if (cur_content_encoding_->cipher_mode() !=
         ContentEncoding::kCipherModeInvalid) {
-      DVLOG(1) << "Unexpected multiple AESSettingsCipherMode.";
+      ERROR_LOG(error_cb_) << "Unexpected multiple AESSettingsCipherMode.";
       return false;
     }
 
     if (val != ContentEncoding::kCipherModeCtr) {
-      DVLOG(1) << "Unexpected AESSettingsCipherMode " << val << ".";
+      ERROR_LOG(error_cb_) << "Unexpected AESSettingsCipherMode " << val << ".";
       return false;
     }
 
     cur_content_encoding_->set_cipher_mode(
         static_cast<ContentEncoding::CipherMode>(val));
     return true;
   }
 
   // This should not happen if WebMListParser is working properly.
   DCHECK(false);
   return false;
 }
 
 // Multiple occurrence restriction is checked in this function.  Mandatory
 // restriction is checked in OnListEnd.
 bool WebMContentEncodingsClient::OnBinary(int id, const uint8* data, int size) {
   DCHECK(cur_content_encoding_.get());
   DCHECK(data);
   DCHECK_GT(size, 0);
 
   if (id == kWebMIdContentEncKeyID) {
     if (!cur_content_encoding_->encryption_key_id().empty()) {
-      DVLOG(1) << "Unexpected multiple ContentEncKeyID";
+      ERROR_LOG(error_cb_) << "Unexpected multiple ContentEncKeyID";
       return false;
     }
     cur_content_encoding_->SetEncryptionKeyId(data, size);
     return true;
   }
 
   // This should not happen if WebMListParser is working properly.
   DCHECK(false);
   return false;
 }
 
 }  // namespace media