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

Unified Diff: media/base/decoder_buffer.cc

Issue 1422643002: Pass DecryptConfig parameters over IPC and use it in AVDA. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed MediaCodec.CodecException that was added only at level 21 (Android L) Created 5 years, 2 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/base/bitstream_buffer.cc ('k') | media/base/decrypt_config.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/decoder_buffer.cc
diff --git a/media/base/decoder_buffer.cc b/media/base/decoder_buffer.cc
index a8624b1e8e705090aea221e23a2ee58154502580..ce02937864ea49f0ff942478ade0127ac4576e58 100644
--- a/media/base/decoder_buffer.cc
+++ b/media/base/decoder_buffer.cc
@@ -99,6 +99,10 @@ std::string DecoderBuffer::AsHumanReadableString() {
<< " encrypted: " << (decrypt_config_ != NULL)
<< " discard_padding (ms): (" << discard_padding_.first.InMilliseconds()
<< ", " << discard_padding_.second.InMilliseconds() << ")";
+
+ if (decrypt_config_)
+ s << " decrypt:" << (*decrypt_config_);
+
return s.str();
}
« no previous file with comments | « media/base/bitstream_buffer.cc ('k') | media/base/decrypt_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698