Encrypted Media: Support config change in DecryptingDemuxerStream.

media/filters/source_buffer_stream.cc

 // Copyright (c) 2012 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/filters/source_buffer_stream.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/bind.h"
@@ skipping 539 matching lines @@
                                     bool reverse_direction) {
   DCHECK_GT(total_bytes_to_free, 0);
   int bytes_to_free = total_bytes_to_free;
   int bytes_freed = 0;
 
   // This range will save the last GOP appended to |range_for_next_append_|
   // if the buffers surrounding it get deleted during garbage collection.
   SourceBufferRange* new_range_for_append = NULL;
 
   while (!ranges_.empty() && bytes_to_free > 0) {
-
     SourceBufferRange* current_range = NULL;
     BufferQueue buffers;
     int bytes_deleted = 0;
 
     if (reverse_direction) {
       current_range = ranges_.back();
       if (current_range->LastGOPContainsNextBufferPosition()) {
         DCHECK_EQ(current_range, selected_range_);
         break;
       }
@@ skipping 483 matching lines @@
   if (audio_configs_[0]->channel_layout() != config.channel_layout()) {
     MEDIA_LOG(log_cb_) << "Audio channel layout changes not allowed.";
     return false;
   }
 
   if (audio_configs_[0]->bits_per_channel() != config.bits_per_channel()) {
     MEDIA_LOG(log_cb_) << "Audio bits per channel changes not allowed.";
     return false;
   }
 
+  if (audio_configs_[0]->is_encrypted() != config.is_encrypted()) {
+    MEDIA_LOG(log_cb_) << "Audio encryption changes not allowed.";
+    return false;
+  }
+
   // Check to see if the new config matches an existing one.
   for (size_t i = 0; i < audio_configs_.size(); ++i) {
     if (config.Matches(*audio_configs_[i])) {
       append_config_index_ = i;
       return true;
     }
   }
 
   // No matches found so let's add this one to the list.
   append_config_index_ = audio_configs_.size();
@@ skipping 10 matching lines @@
   if (video_configs_[0]->is_encrypted() != config.is_encrypted()) {
     MEDIA_LOG(log_cb_) <<"Video Encryption changes not allowed.";
     return false;
   }
 
   if (video_configs_[0]->codec() != config.codec()) {
     MEDIA_LOG(log_cb_) <<"Video codec changes not allowed.";
     return false;
   }
 
+  if (video_configs_[0]->is_encrypted() != config.is_encrypted()) {
+    MEDIA_LOG(log_cb_) << "Video encryption changes not allowed.";
+    return false;
+  }
+
   // Check to see if the new config matches an existing one.
   for (size_t i = 0; i < video_configs_.size(); ++i) {
     if (config.Matches(*video_configs_[i])) {
       append_config_index_ = i;
       return true;
     }
   }
 
   // No matches found so let's add this one to the list.
   append_config_index_ = video_configs_.size();
@@ skipping 460 matching lines @@
   return ComputeFudgeRoom(GetApproximateDuration());
 }
 
 base::TimeDelta SourceBufferRange::GetApproximateDuration() const {
   base::TimeDelta max_interbuffer_distance = interbuffer_distance_cb_.Run();
   DCHECK(max_interbuffer_distance != kNoTimestamp());
   return max_interbuffer_distance;
 }
 
 }  // namespace media