Add Common Encryption support to BMFF, including subsample decryption.

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 <vector>
+
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/media_export.h"
 #include "media/base/stream_parser.h"
 #include "media/mp4/aac.h"
 #include "media/mp4/offset_byte_queue.h"
 #include "media/mp4/track_run_iterator.h"
 
@@ skipping 21 matching lines @@
     kWaitingForInit,
     kParsingBoxes,
     kEmittingSamples,
     kError
   };
 
   bool ParseBox(bool* err);
   bool ParseMoov(mp4::BoxReader* reader);
   bool ParseMoof(mp4::BoxReader* reader);
 
+  bool EmitKeyNeeded(const TrackEncryption& track_encryption);
+
   bool ReadMDATsUntil(const int64 tgt_tail);
 
   void ChangeState(State new_state);
 
   bool EmitConfigs();
+  bool PrepareAVCBuffer(std::vector<uint8>* frame_buf,
+                        std::vector<SubsampleEntry>* subsamples);
   bool EnqueueSample(BufferQueue* audio_buffers,
                      BufferQueue* video_buffers,
                      bool* err);
   bool SendAndFlushSamples(BufferQueue* audio_buffers,
                            BufferQueue* video_buffers);
 
   State state_;
   InitCB init_cb_;
   NewConfigCB config_cb_;
   NewBuffersCB audio_cb_;
@@ skipping 15 matching lines @@
 
   mp4::TrackRunIterator runs_;
 
   scoped_ptr<mp4::Movie> moov_;
 
   bool has_audio_;
   bool has_video_;
   uint32 audio_track_id_;
   uint32 video_track_id_;
 
   // We keep them around to avoid having to go digging through the moov with

[ddorwin, 2012/07/17 01:14:21]

s/them/these/

[strobe_, 2012/07/19 02:43:35]

Rebased away.

   // every frame.
   AAC aac_;
   uint8 size_of_nalu_length_;
 
   DISALLOW_COPY_AND_ASSIGN(MP4StreamParser);
 };
 
 }  // namespace mp4
 }  // namespace media
 
 #endif  // MEDIA_MP4_MP4_STREAM_PARSER_H_