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

Unified Diff: content/renderer/media/cdm/ppapi_decryptor.cc

Issue 2543623003: media: Allow config change between clear and encrypted streams (Closed)
Patch Set: media: Allow config change between clear and encrypted streams Created 3 years, 11 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
Index: content/renderer/media/cdm/ppapi_decryptor.cc
diff --git a/content/renderer/media/cdm/ppapi_decryptor.cc b/content/renderer/media/cdm/ppapi_decryptor.cc
index 835907cbf2e4ba4671334ea38519d387e292a637..b7f918cc426fc5f06f86e82bef3f1bb962e1c0a7 100644
--- a/content/renderer/media/cdm/ppapi_decryptor.cc
+++ b/content/renderer/media/cdm/ppapi_decryptor.cc
@@ -247,6 +247,8 @@ void PpapiDecryptor::Decrypt(
return;
}
+ // TODO(xhwang): If the buffer is not encrypted, return it directly.
+
DVLOG(3) << __func__ << " - stream_type: " << stream_type;
if (!CdmDelegate() ||
!CdmDelegate()->Decrypt(stream_type, encrypted, decrypt_cb)) {
@@ -278,7 +280,6 @@ void PpapiDecryptor::InitializeAudioDecoder(
}
DVLOG(2) << __func__;
- DCHECK(config.is_encrypted());
DCHECK(config.IsValidConfig());
audio_decoder_init_cb_ = init_cb;
@@ -302,7 +303,6 @@ void PpapiDecryptor::InitializeVideoDecoder(
}
DVLOG(2) << __func__;
- DCHECK(config.is_encrypted());
DCHECK(config.IsValidConfig());
video_decoder_init_cb_ = init_cb;

Powered by Google App Engine
This is Rietveld 408576698