Encrypted Media: Rename NeedKey to EncryptedMediaInitData.

media/formats/mp4/mp4_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_MP4_MP4_STREAM_PARSER_H_
 #define MEDIA_FORMATS_MP4_MP4_STREAM_PARSER_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 10 matching lines @@
 namespace mp4 {
 
 struct Movie;
 class BoxReader;
 
 class MEDIA_EXPORT MP4StreamParser : public StreamParser {
  public:
   MP4StreamParser(const std::set<int>& audio_object_types, bool has_sbr);
   virtual ~MP4StreamParser();
 
-  virtual void Init(const InitCB& init_cb, const NewConfigCB& config_cb,
-                    const NewBuffersCB& new_buffers_cb,
-                    bool ignore_text_tracks,
-                    const NeedKeyCB& need_key_cb,
-                    const NewMediaSegmentCB& new_segment_cb,
-                    const base::Closure& end_of_segment_cb,
-                    const LogCB& log_cb) override;
+  virtual void Init(
+      const InitCB& init_cb,
+      const NewConfigCB& config_cb,
+      const NewBuffersCB& new_buffers_cb,
+      bool ignore_text_tracks,
+      const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
+      const NewMediaSegmentCB& new_segment_cb,
+      const base::Closure& end_of_segment_cb,
+      const LogCB& log_cb) override;
   virtual void Flush() override;
   virtual bool Parse(const uint8* buf, int size) override;
 
  private:
   enum State {
     kWaitingForInit,
     kParsingBoxes,
     kWaitingForSampleData,
     kEmittingSamples,
     kError
   };
 
   bool ParseBox(bool* err);
   bool ParseMoov(mp4::BoxReader* reader);
   bool ParseMoof(mp4::BoxReader* reader);
 
-  void EmitNeedKeyIfNecessary(
+  void OnEncryptedMediaInitData(
       const std::vector<ProtectionSystemSpecificHeader>& headers);
 
   // To retain proper framing, each 'mdat' atom must be read; to limit memory
   // usage, the atom's data needs to be discarded incrementally as frames are
   // extracted from the stream. This function discards data from the stream up
   // to |max_clear_offset|, updating the |mdat_tail_| value so that framing can
   // be retained after all 'mdat' information has been read. |max_clear_offset|
   // is the upper bound on what can be removed from |queue_|. Anything below
   // this offset is no longer needed by the parser.
   // Returns 'true' on success, 'false' if there was an error.
@@ skipping 22 matching lines @@
 
   // Sets |highest_end_offset_| based on the data in |moov_|
   // and |moof|. Returns true if |highest_end_offset_| was successfully
   // computed.
   bool ComputeHighestEndOffset(const MovieFragment& moof);
 
   State state_;
   InitCB init_cb_;
   NewConfigCB config_cb_;
   NewBuffersCB new_buffers_cb_;
-  NeedKeyCB need_key_cb_;
+  EncryptedMediaInitDataCB encrypted_media_init_data_cb_;
   NewMediaSegmentCB new_segment_cb_;
   base::Closure end_of_segment_cb_;
   LogCB log_cb_;
 
   OffsetByteQueue queue_;
 
   // These two parameters are only valid in the |kEmittingSegments| state.
   //
   // |moof_head_| is the offset of the start of the most recently parsed moof
   // block. All byte offsets in sample information are relative to this offset,
@@ skipping 21 matching lines @@
   bool is_audio_track_encrypted_;
   bool is_video_track_encrypted_;
 
   DISALLOW_COPY_AND_ASSIGN(MP4StreamParser);
 };
 
 }  // namespace mp4
 }  // namespace media
 
 #endif  // MEDIA_FORMATS_MP4_MP4_STREAM_PARSER_H_