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

Unified Diff: media/filters/fake_video_decoder.cc

Issue 2650823006: media: Pass CdmContext in decoder reinitialization (Closed)
Patch Set: 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
« no previous file with comments | « media/filters/fake_video_decoder.h ('k') | media/filters/video_frame_stream_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/fake_video_decoder.cc
diff --git a/media/filters/fake_video_decoder.cc b/media/filters/fake_video_decoder.cc
index 407fdedf3ce42cee1e72dbc3aa18714defbd2b93..013cecaddbf4d3984ff1f421d66f8844eaf1377e 100644
--- a/media/filters/fake_video_decoder.cc
+++ b/media/filters/fake_video_decoder.cc
@@ -21,10 +21,12 @@ FakeVideoDecoder::FakeVideoDecoder(int decoding_delay,
total_bytes_decoded_(0),
fail_to_initialize_(false),
weak_factory_(this) {
+ DVLOG(1) << __func__;
DCHECK_GE(decoding_delay, 0);
}
FakeVideoDecoder::~FakeVideoDecoder() {
+ DVLOG(1) << __func__;
DCHECK(thread_checker_.CalledOnValidThread());
if (state_ == STATE_UNINITIALIZED)
@@ -40,15 +42,20 @@ FakeVideoDecoder::~FakeVideoDecoder() {
decoded_frames_.clear();
}
+void FakeVideoDecoder::EnableEncryptedConfigSupport() {
+ supports_encrypted_config_ = true;
+}
+
std::string FakeVideoDecoder::GetDisplayName() const {
return "FakeVideoDecoder";
}
void FakeVideoDecoder::Initialize(const VideoDecoderConfig& config,
bool low_delay,
- CdmContext* /* cdm_context */,
+ CdmContext* cdm_context,
const InitCB& init_cb,
const OutputCB& output_cb) {
+ DVLOG(1) << __func__;
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(config.IsValidConfig());
DCHECK(held_decode_callbacks_.empty())
@@ -67,6 +74,11 @@ void FakeVideoDecoder::Initialize(const VideoDecoderConfig& config,
decoded_frames_.clear();
}
+ if (config.is_encrypted() && (!supports_encrypted_config_ || !cdm_context)) {
+ DVLOG(1) << "Encrypted config not supported.";
+ fail_to_initialize_ = true;
+ }
+
if (fail_to_initialize_) {
state_ = STATE_ERROR;
init_cb_.RunOrHold(false);
« no previous file with comments | « media/filters/fake_video_decoder.h ('k') | media/filters/video_frame_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698