Declare intent to use sample-aes later in the stream.

media/formats/mp2t/es_parser_h264.cc

 // Copyright 2014 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/formats/mp2t/es_parser_h264.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
@@ skipping 418 matching lines @@
 
   // Emit a frame.
   DVLOG(LOG_LEVEL_ES) << "Emit frame: stream_pos=" << current_access_unit_pos_
                       << " size=" << access_unit_size;
   int es_size;
   const uint8_t* es;
   es_queue_->PeekAt(current_access_unit_pos_, &es, &es_size);
   CHECK_GE(es_size, access_unit_size);
 
 #if BUILDFLAG(ENABLE_HLS_SAMPLE_AES)
+  const DecryptConfig* base_decrypt_config = nullptr;
+  if (use_hls_sample_aes_) {
+    DCHECK(!get_decrypt_config_cb_.is_null());
+    base_decrypt_config = get_decrypt_config_cb_.Run();
+  }
+
   std::unique_ptr<uint8_t[]> adjusted_au;
   std::vector<SubsampleEntry> subsamples;
-  if (use_hls_sample_aes_) {
+  if (use_hls_sample_aes_ && base_decrypt_config) {
     adjusted_au = AdjustAUForSampleAES(es, &access_unit_size, protected_blocks_,
                                        &subsamples);
     protected_blocks_.clear();
     if (adjusted_au)
       es = adjusted_au.get();
   }
 #endif
 
   // TODO(wolenetz/acolwell): Validate and use a common cross-parser TrackId
   // type and allow multiple video tracks. See https://crbug.com/341581.
   scoped_refptr<StreamParserBuffer> stream_parser_buffer =
       StreamParserBuffer::CopyFrom(es, access_unit_size, is_key_frame,
                                    DemuxerStream::VIDEO, kMp2tVideoTrackId);
   stream_parser_buffer->SetDecodeTimestamp(current_timing_desc.dts);
   stream_parser_buffer->set_timestamp(current_timing_desc.pts);
 #if BUILDFLAG(ENABLE_HLS_SAMPLE_AES)
-  if (use_hls_sample_aes_) {
-    DCHECK(!get_decrypt_config_cb_.is_null());
-    const DecryptConfig* base_decrypt_config = get_decrypt_config_cb_.Run();
-    RCHECK(base_decrypt_config);
+  if (use_hls_sample_aes_ && base_decrypt_config) {
     std::unique_ptr<DecryptConfig> decrypt_config(new DecryptConfig(
         base_decrypt_config->key_id(), base_decrypt_config->iv(), subsamples));
     stream_parser_buffer->set_decrypt_config(std::move(decrypt_config));
   }
 #endif
   return es_adapter_.OnNewBuffer(stream_parser_buffer);
 }
 
 bool EsParserH264::UpdateVideoDecoderConfig(const H264SPS* sps,
                                             const EncryptionScheme& scheme) {
@@ skipping 43 matching lines @@
              << " height=" << sps->sar_height;
     last_video_decoder_config_ = video_decoder_config;
     es_adapter_.OnConfigChanged(video_decoder_config);
   }
 
   return true;
 }
 
 }  // namespace mp2t
 }  // namespace media