media: Refactor MediaCrypto creation and notification.

media/base/android/media_decoder_job.cc

 // Copyright 2013 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_decoder_job.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 181 matching lines @@
     // Since the decoder job is not decoding data, we can safely destroy
     // |media_codec_bridge_|.
     ReleaseMediaCodecBridge();
     return;
   }
 
   // Release |media_codec_bridge_| once decoding is completed.
   release_resources_pending_ = true;
 }
 
-base::android::ScopedJavaLocalRef<jobject> MediaDecoderJob::GetMediaCrypto() {
-  base::android::ScopedJavaLocalRef<jobject> media_crypto;
-  if (drm_bridge_)
-    media_crypto = drm_bridge_->GetMediaCrypto();
-  return media_crypto;
+jobject MediaDecoderJob::GetMediaCrypto() {
+  return drm_bridge_ ? drm_bridge_->GetMediaCrypto() : nullptr;
 }
 
 bool MediaDecoderJob::SetCurrentFrameToPreviouslyCachedKeyFrame() {
   const std::vector<AccessUnit>& access_units =
       received_data_[current_demuxer_data_index_].access_units;
   // If the current data chunk is empty, the player must be in an initial or
   // seek state. The next access unit will always be a key frame.
   if (access_units.size() == 0)
     return true;
 
@@ skipping 442 matching lines @@
 
   if (!HasStream()) {
     ReleaseMediaCodecBridge();
     return STATUS_FAILURE;
   }
 
   // Create |media_codec_bridge_| only if config changes.
   if (media_codec_bridge_ && !need_to_reconfig_decoder_job_)
     return STATUS_SUCCESS;
 
-  base::android::ScopedJavaLocalRef<jobject> media_crypto = GetMediaCrypto();
-  if (is_content_encrypted_ && media_crypto.is_null())
+  if (is_content_encrypted_ && !GetMediaCrypto())
     return STATUS_FAILURE;
 
   ReleaseMediaCodecBridge();
   DVLOG(1) << __FUNCTION__ << " : creating new media codec bridge";
 
   return CreateMediaCodecBridgeInternal();
 }
 
 bool MediaDecoderJob::IsCodecReconfigureNeeded(
     const DemuxerConfigs& configs) const {
@@ skipping 10 matching lines @@
 
 void MediaDecoderJob::ReleaseMediaCodecBridge() {
   if (!media_codec_bridge_)
     return;
 
   media_codec_bridge_.reset();
   input_buf_index_ = -1;
 }
 
 }  // namespace media