Add SupportsConfigChanges() to DemuxerStream.

media/filters/decrypting_demuxer_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/decrypting_demuxer_stream.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 143 matching lines @@
 
 DemuxerStream::Type DecryptingDemuxerStream::type() {
   DCHECK(state_ != kUninitialized && state_ != kDecryptorRequested) << state_;
   return demuxer_stream_->type();
 }
 
 void DecryptingDemuxerStream::EnableBitstreamConverter() {
   demuxer_stream_->EnableBitstreamConverter();
 }
 
+bool DecryptingDemuxerStream::SupportsConfigChanges() {
+  // If we don't have |demuxer_stream_| yet (we haven't been Initialize()-ed),
+  // be conservative and assume we could have config changes.
+  return demuxer_stream_ ? demuxer_stream_->SupportsConfigChanges() : true;

[scherkus (not reviewing), 2014/03/25 22:16:47]

line 161 doesn't make this assumption nor do other methods

my $0.02: try to avoid optional / unsure code and find out whether we can stick
with the much simpler "demuxer_stream->SCC();"

[rileya (GONE FROM CHROMIUM), 2014/03/25 22:43:19]

Good point, removed that behavior. Looks like the only time we create a DDS
outside of the unit tests, we Initialize() it immediately. I figured a DCHECK
couldn't hurt anyway though.

+}
+
 DecryptingDemuxerStream::~DecryptingDemuxerStream() {
   DVLOG(2) << __FUNCTION__ << " : state_ = " << state_;
 }
 
 void DecryptingDemuxerStream::SetDecryptor(Decryptor* decryptor) {
   DVLOG(2) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK_EQ(state_, kDecryptorRequested) << state_;
   DCHECK(!init_cb_.is_null());
   DCHECK(!set_decryptor_ready_cb_.is_null());
@@ skipping 212 matching lines @@
       break;
     }
 
     default:
       NOTREACHED();
       return;
   }
 }
 
 }  // namespace media