Make the timestamp unroll offset consistent accross PES pids.

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 <list>
 #include <map>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/byte_queue.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"
 
 namespace media {
 
 class StreamParserBuffer;
 
 namespace mp2t {
 
 class PidState;
 
 class MEDIA_EXPORT Mp2tStreamParser : public StreamParser {
@@ skipping 57 matching lines @@
   // 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();
 
+  void ApplyTimeOffset(StreamParser::BufferQueue* buffer_queue);
+
   // List of callbacks.
   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_;
 
   // True when AAC SBR extension is signalled in the mimetype
@@ skipping 11 matching lines @@
   int selected_video_pid_;
 
   // Pending audio & video buffers.
   std::list<BufferQueueWithConfig> buffer_queue_chain_;
 
   // Whether |init_cb_| has been invoked.
   bool is_initialized_;
 
   // 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_;
+
+  // The timestamp unroller might create negative timestamps,
+  // we need to add a time offset to make sure all timestamps are positive.
   base::TimeDelta time_offset_;
 
   DISALLOW_COPY_AND_ASSIGN(Mp2tStreamParser);
 };
 
 }  // namespace mp2t
 }  // namespace media
 
 #endif