media: Refactor MediaCrypto creation and notification.

media/base/android/media_codec_player.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/android/media_codec_player.h"
 
 #include "base/barrier_closure.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/lazy_instance.h"
@@ skipping 919 matching lines @@
     bool needs_protected_surface) {
   DCHECK(GetMediaTaskRunner()->BelongsToCurrentThread());
   DVLOG(1) << __FUNCTION__ << " protected surface is "
            << (needs_protected_surface ? "required" : "not required");
 
   // We use the parameters that come with this callback every time we call
   // Configure(). This is possible only if the MediaCrypto object remains valid
   // and the surface requirement does not change until new SetCdm() is called.
 
   DCHECK(media_crypto);
-  DCHECK(!media_crypto->is_null());
+
+  if (media_crypto->is_null()) {
+    // TODO(timav): Fail playback nicely here.
+    LOG(ERROR) << "MediaCrypto creation failed.";
+    return;
+  }
 
   media_crypto_ = media_crypto.Pass();
 
   if (audio_decoder_) {
     audio_decoder_->SetNeedsReconfigure();
   }
 
   if (video_decoder_) {
     video_decoder_->SetNeedsReconfigure();
     video_decoder_->SetProtectedSurfaceRequired(needs_protected_surface);
@@ skipping 447 matching lines @@
     RETURN_STRING(kStateWaitingForMediaCrypto);
     RETURN_STRING(kStateWaitingForSeek);
     RETURN_STRING(kStateError);
   }
   return nullptr;  // crash early
 }
 
 #undef RETURN_STRING
 
 }  // namespace media