Generalize AesDecryptor to make it more spec compliant.

media/mp4/mp4_stream_parser.h

 // 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.
 
 #ifndef MEDIA_MP4_MP4_STREAM_PARSER_H_
 #define MEDIA_MP4_MP4_STREAM_PARSER_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
@@ skipping 10 matching lines @@
 class BoxReader;
 
 class MEDIA_EXPORT MP4StreamParser : public StreamParser {
  public:
   MP4StreamParser();
   virtual ~MP4StreamParser();
 
   virtual void Init(const InitCB& init_cb, const NewConfigCB& config_cb,
                     const NewBuffersCB& audio_cb,
                     const NewBuffersCB& video_cb,
-                    const KeyNeededCB& key_needed_cb,
+                    const NeedKeyCB& need_key_cb,
                     const NewMediaSegmentCB& new_segment_cb) OVERRIDE;
   virtual void Flush() OVERRIDE;
   virtual bool Parse(const uint8* buf, int size) OVERRIDE;
 
  private:
   enum State {
     kWaitingForInit,
     kParsingBoxes,
     kEmittingSamples,
     kError
@@ skipping 10 matching lines @@
   bool EmitConfigs();
   bool EnqueueSample(BufferQueue* audio_buffers,
                      BufferQueue* video_buffers,
                      bool* err);
 
   State state_;
   InitCB init_cb_;
   NewConfigCB config_cb_;
   NewBuffersCB audio_cb_;
   NewBuffersCB video_cb_;
-  KeyNeededCB key_needed_cb_;
+  NeedKeyCB need_key_cb_;
   NewMediaSegmentCB new_segment_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,
   // as mandated by the Media Source spec.
   int64 moof_head_;
@@ skipping 15 matching lines @@
   // every frame.
   uint8 size_of_nalu_length_;
 
   DISALLOW_COPY_AND_ASSIGN(MP4StreamParser);
 };
 
 }  // namespace mp4
 }  // namespace media
 
 #endif  // MEDIA_MP4_MP4_STREAM_PARSER_H_