media: Update logging to display the missing keyId

media/filters/decrypting_demuxer_stream.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

[xhwang, 2016/09/09 18:20:00]

Can you also update DecryptingAudioDecoder?

[jrummell, 2016/09/12 19:53:30]

Done.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/decrypting_demuxer_stream.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
+#include "base/strings/string_number_conversions.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/media_log.h"
 #include "media/base/media_util.h"
 
 namespace media {
 
 static bool IsStreamValidAndEncrypted(DemuxerStream* stream) {
   return ((stream->type() == DemuxerStream::AUDIO &&
            stream->audio_decoder_config().IsValidConfig() &&
@@ skipping 267 matching lines @@
   if (status == Decryptor::kError) {
     DVLOG(2) << "DoDeliverBuffer() - kError";
     MEDIA_LOG(ERROR, media_log_) << GetDisplayName() << ": decrypt error";
     pending_buffer_to_decrypt_ = NULL;
     state_ = kIdle;
     base::ResetAndReturn(&read_cb_).Run(kAborted, NULL);
     return;
   }
 
   if (status == Decryptor::kNoKey) {
-    DVLOG(2) << "DoDeliverBuffer() - kNoKey";
-    MEDIA_LOG(DEBUG, media_log_) << GetDisplayName() << ": no key";
+    std::string key_id = pending_buffer_to_decrypt_->decrypt_config()->key_id();
+    std::string missing_key_id = base::HexEncode(key_id.data(), key_id.size());
+    DVLOG(1) << "DeliverBuffer() - kNoKey, missing keyID " << missing_key_id;

[xhwang, 2016/09/09 18:20:00]

here and below, "missing keyID" is a bit ambiguous. We really are "missing the
key for key ID xx". How about:

"... no key for key ID " << missing_key_id;

[jrummell, 2016/09/12 19:53:30]

Done.

+    MEDIA_LOG(INFO, media_log_) << GetDisplayName()
+                                << ": no key, missing keyId " << missing_key_id;
+
     if (need_to_try_again_if_nokey) {
       // The |state_| is still kPendingDecrypt.
       DecryptPendingBuffer();
       return;
     }
 
     state_ = kWaitingForKey;
     waiting_for_decryption_key_cb_.Run();
     return;
   }
@@ skipping 72 matching lines @@
       break;
     }
 
     default:
       NOTREACHED();
       return;
   }
 }
 
 }  // namespace media