Commit f2cd9430 authored by Xiaohan Wang's avatar Xiaohan Wang Committed by Commit Bot

media: Remove confusing MediaLog message in DecryptingDemuxerStream

Today on systems where we use AesDecryptor for Clear Key key system and
MojoCdm for other key systems, the DecoderSelector will always try to
see whether there is a Decryptor exposed by the CDM to decrypt the
stream directly (e.g. AesDecryptor). If not, it'll fallback to MojoCdm
which will typically will decrypt and decode in the remote process.

Hence, "no decryptor" exposed by a CDM is normal. Previously we report
this as a "debug" message in MediaLog, but it often causes confusions.

This CL changes this MediaLog log to DVLOG to avoid such confusion.

Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: If434dd7ae5bc7e76ab68c964190b465bf55d9185
Reviewed-on: https://chromium-review.googlesource.com/803671Reviewed-by: default avatarJohn Rummell <jrummell@chromium.org>
Reviewed-by: default avatarFrank Liberato <liberato@chromium.org>
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521146}
parent 567984c5
...@@ -58,7 +58,7 @@ void DecryptingDemuxerStream::Initialize(DemuxerStream* stream, ...@@ -58,7 +58,7 @@ void DecryptingDemuxerStream::Initialize(DemuxerStream* stream,
InitializeDecoderConfig(); InitializeDecoderConfig();
if (!cdm_context->GetDecryptor()) { if (!cdm_context->GetDecryptor()) {
MEDIA_LOG(DEBUG, media_log_) << GetDisplayName() << ": no decryptor"; DVLOG(2) << __func__ << ": no decryptor";
state_ = kUninitialized; state_ = kUninitialized;
base::ResetAndReturn(&init_cb_).Run(DECODER_ERROR_NOT_SUPPORTED); base::ResetAndReturn(&init_cb_).Run(DECODER_ERROR_NOT_SUPPORTED);
return; return;
......
...@@ -313,7 +313,6 @@ TEST_F(DecryptingDemuxerStreamTest, Initialize_CdmWithoutDecryptor) { ...@@ -313,7 +313,6 @@ TEST_F(DecryptingDemuxerStreamTest, Initialize_CdmWithoutDecryptor) {
AudioDecoderConfig input_config(kCodecVorbis, kSampleFormatPlanarF32, AudioDecoderConfig input_config(kCodecVorbis, kSampleFormatPlanarF32,
CHANNEL_LAYOUT_STEREO, 44100, CHANNEL_LAYOUT_STEREO, 44100,
EmptyExtraData(), AesCtrEncryptionScheme()); EmptyExtraData(), AesCtrEncryptionScheme());
EXPECT_MEDIA_LOG(HasSubstr("DecryptingDemuxerStream: no decryptor"));
InitializeAudioAndExpectStatus(input_config, DECODER_ERROR_NOT_SUPPORTED); InitializeAudioAndExpectStatus(input_config, DECODER_ERROR_NOT_SUPPORTED);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment