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

media/formats/mp2t/mp2t_stream_parser.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_FORMATS_MP2T_MP2T_STREAM_PARSER_H_
 #define MEDIA_FORMATS_MP2T_MP2T_STREAM_PARSER_H_
 
 #include <stdint.h>
 
 #include <list>
 #include <map>
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/byte_queue.h"
 #include "media/base/decrypt_config.h"
+#include "media/base/encryption_scheme.h"
 #include "media/base/media_export.h"
 #include "media/base/stream_parser.h"
 #include "media/base/video_decoder_config.h"
 #include "media/formats/mp2t/timestamp_unroller.h"
 #include "media/media_features.h"
 
 namespace media {
 
 class DecryptConfig;
 class StreamParserBuffer;
 
 namespace mp2t {
 
 class Descriptors;
+class EsParser;
 class PidState;
 
 class MEDIA_EXPORT Mp2tStreamParser : public StreamParser {
  public:
   explicit Mp2tStreamParser(bool sbr_in_mimetype);
   ~Mp2tStreamParser() override;
 
   // StreamParser implementation.
   void Init(const InitCB& init_cb,
             const NewConfigCB& config_cb,
@@ skipping 21 matching lines @@
     StreamParser::BufferQueue video_queue;
   };
 
   // Callback invoked to register a Program Map Table.
   // Note: Does nothing if the PID is already registered.
   void RegisterPmt(int program_number, int pmt_pid);
 
   // Callback invoked to register a PES pid.
   // Possible values for |stream_type| are defined in:
   // ISO-13818.1 / ITU H.222 Table 2.34 "Stream type assignments".
-  // |pes_pid| is part of the Program Map Table refered by |pmt_pid|.
+  // |pes_pid| is part of the Program Map Table..

[servolk, 2017/04/04 20:08:18]

nit: extra dot at the end

[dougsteed, 2017/04/26 20:34:14]

Done.

   // Some stream types are qualified by additional |descriptors|.
-  void RegisterPes(int pmt_pid,
-                   int pes_pid,
+  void RegisterPes(int pes_pid,
                    int stream_type,
                    const Descriptors& descriptors);
 
   // Since the StreamParser interface allows only one audio & video streams,
   // an automatic PID filtering should be applied to select the audio & video
   // streams.
   void UpdatePidFilter();
 
   // Callback invoked each time the audio/video decoder configuration is
   // changed.
   void OnVideoConfigChanged(int pes_pid,
                             const VideoDecoderConfig& video_decoder_config);
   void OnAudioConfigChanged(int pes_pid,
                             const AudioDecoderConfig& audio_decoder_config);
 
   // Invoke the initialization callback if needed.
   bool FinishInitializationIfNeeded();
 
   // Callback invoked by the ES stream parser
   // to emit a new audio/video access unit.
   void OnEmitAudioBuffer(
       int pes_pid,
       scoped_refptr<StreamParserBuffer> stream_parser_buffer);
   void OnEmitVideoBuffer(
       int pes_pid,
       scoped_refptr<StreamParserBuffer> stream_parser_buffer);
   bool EmitRemainingBuffers();
 
+  // Functions used to test stream type and create parsers as appropriate.
+  std::unique_ptr<EsParser> MaybeCreateH264Parser(
+      int pes_pid,
+      int stream_type,
+      const Descriptors& descriptors);
+  std::unique_ptr<EsParser> MaybeCreateAACParser(
+      int pes_pid,
+      int stream_type,
+      const Descriptors& descriptors);
+  std::unique_ptr<EsParser> MaybeCreateMpeg1AudioParser(int pes_pid,
+                                                        int stream_type);
+
 #if BUILDFLAG(ENABLE_HLS_SAMPLE_AES)
   std::unique_ptr<PidState> MakeCatPidState();
   void UnregisterCat();
 
   // Register the PIDs for the Cenc packets (CENC-ECM and CENC-PSSH).
   void RegisterCencPids(int ca_pid, int pssh_pid);
   void UnregisterCencPids();
 
+  // Register a default encryption scheme to be used for decoder configs. This
+  // value is only used in the absence of explicit encryption metadata, as might
+  // be the case during an unencrypted portion of a live stream.
+  void RegisterEncryptionScheme(const EncryptionScheme& scheme);
+
   // Register the DecryptConfig (parsed from CENC-ECM).
   void RegisterDecryptConfig(const DecryptConfig& config);
 
   // Register the PSSH (parsed from CENC-PSSH).
   void RegisterPsshBoxes(const std::vector<uint8_t>& init_data);
 
   const DecryptConfig* GetDecryptConfig() { return decrypt_config_.get(); }
 #endif
 
   // List of callbacks.
@@ skipping 27 matching lines @@
 
   // Indicate whether a segment was started.
   bool segment_started_;
 
   // Timestamp unroller.
   // Timestamps in PES packets must be unrolled using the same offset.
   // So the unroller is global between PES pids.
   TimestampUnroller timestamp_unroller_;
 
 #if BUILDFLAG(ENABLE_HLS_SAMPLE_AES)
+  EncryptionScheme initial_scheme_;
   std::unique_ptr<DecryptConfig> decrypt_config_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(Mp2tStreamParser);
 };
 
 }  // namespace mp2t
 }  // namespace media
 
 #endif  // MEDIA_FORMATS_MP2T_MP2T_STREAM_PARSER_H_