media: Prefer decrypting pipeline when CDM is attached

media/filters/decoder_selector.h

 // 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.
 
 #ifndef MEDIA_FILTERS_DECODER_SELECTOR_H_
 #define MEDIA_FILTERS_DECODER_SELECTOR_H_
 
 #include <memory>
 
 #include "base/callback.h"
@@ skipping 19 matching lines @@
 // DecoderSelector (creates if necessary and) initializes the proper
 // Decoder for a given DemuxerStream. If the given DemuxerStream is
 // encrypted, a DecryptingDemuxerStream may also be created.
 // The template parameter |StreamType| is the type of stream we will be
 // selecting a decoder for.
 template<DemuxerStream::Type StreamType>
 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
   // Decoder initialization failed.
   // - Second parameter: The initialized DecryptingDemuxerStream. If it's not
   // NULL, then a DecryptingDemuxerStream is created and initialized to do
   // decryption for the initialized Decoder.
   // Note: The caller owns selected Decoder and DecryptingDemuxerStream.
   // The caller should call DecryptingDemuxerStream::Reset() before
   // calling Decoder::Reset() to release any pending decryption or read.
@@ skipping 36 matching lines @@
   void DecryptingDemuxerStreamInitDone(PipelineStatus status);
   void InitializeDecoder();
   void DecoderInitDone(bool success);
   void ReturnNullDecoder();
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   ScopedVector<Decoder> decoders_;
   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_;
   base::Closure waiting_for_decryption_key_cb_;
 
   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_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(DecoderSelector);
 };
 
 typedef DecoderSelector<DemuxerStream::VIDEO> VideoDecoderSelector;
 typedef DecoderSelector<DemuxerStream::AUDIO> AudioDecoderSelector;
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_DECODER_SELECTOR_H_