media: Prefer decrypting pipeline when CDM is attached

media/filters/decoder_selector.h

Index: media/filters/decoder_selector.h
diff --git a/media/filters/decoder_selector.h b/media/filters/decoder_selector.h
index dfd948ef18aaaa9abc747637f561ba11cc73e907..09378b86c113745a5b9cbb6ba0f7b5235665f426 100644
--- a/media/filters/decoder_selector.h
+++ b/media/filters/decoder_selector.h
@@ -37,6 +37,7 @@ class MEDIA_EXPORT DecoderSelector {
  public:
   typedef DecoderStreamTraits<StreamType> StreamTraits;
   typedef typename StreamTraits::DecoderType Decoder;
+  typedef typename StreamTraits::DecoderConfigType DecoderConfig;
 
   // Indicates completion of Decoder selection.
   // - First parameter: The initialized Decoder. If it's set to NULL, then
@@ -93,7 +94,11 @@ class MEDIA_EXPORT DecoderSelector {
   scoped_refptr<MediaLog> media_log_;
 
   StreamTraits* traits_;
+
+  // Could be the |stream| passed in SelectDecoder, or |decrypted_stream_| when
+  // a DecryptingDemuxerStream is selected.
   DemuxerStream* input_stream_;
+
   CdmContext* cdm_context_;
   SelectDecoderCB select_decoder_cb_;
   typename Decoder::OutputCB output_cb_;
@@ -102,6 +107,9 @@ class MEDIA_EXPORT DecoderSelector {
   std::unique_ptr<Decoder> decoder_;
   std::unique_ptr<DecryptingDemuxerStream> decrypted_stream_;
 
+  // Config of the |input_stream| used to initialize decoders.
+  DecoderConfig config_;
+
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<DecoderSelector> weak_ptr_factory_;