Fix muxed MP4 parsing so it won't crash on partial media segment appends.

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 24 matching lines @@
                     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(
       const std::vector<ProtectionSystemSpecificHeader>& headers);
@@ skipping 16 matching lines @@
                         std::vector<uint8>* frame_buf,
                         std::vector<SubsampleEntry>* subsamples) const;
   bool EnqueueSample(BufferQueue* audio_buffers,
                      BufferQueue* video_buffers,
                      bool* err);
   bool SendAndFlushSamples(BufferQueue* audio_buffers,
                            BufferQueue* video_buffers);
 
   void Reset();
 
+  // Checks to see if we have enough data in |queue_| to transition to
+  // kEmittingSamples and start enqueuing samples.
+  bool HaveEnoughDataToEnqueueSamples();
+
+  // 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_;
   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,
   // as mandated by the Media Source spec.
   int64 moof_head_;
   // |mdat_tail_| is the stream offset of the end of the current 'mdat' box.
   // Valid iff it is greater than the head of the queue.
   int64 mdat_tail_;
 
+  // The highest end offset in the current moof. This offset is
+  // relative to |moof_head_|. This value is used to make sure we have collected
+  // enough bytes to parse all samples and aux_info in the current moof.
+  int64 highest_end_offset_;
+
   scoped_ptr<mp4::Movie> moov_;
   scoped_ptr<mp4::TrackRunIterator> runs_;
 
   bool has_audio_;
   bool has_video_;
   uint32 audio_track_id_;
   uint32 video_track_id_;
   // The object types allowed for audio tracks.
   std::set<int> audio_object_types_;
   bool has_sbr_;
   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_