Make the timestamp unroll offset consistent accross PES pids.

media/formats/mp2t/ts_section_pes.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_TS_SECTION_PES_H_
 #define MEDIA_FORMATS_MP2T_TS_SECTION_PES_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/byte_queue.h"
 #include "media/formats/mp2t/ts_section.h"
 
 namespace media {
 namespace mp2t {
 
 class EsParser;
+class TimestampUnroller;
 
 class TsSectionPes : public TsSection {
  public:
-  explicit TsSectionPes(scoped_ptr<EsParser> es_parser);
+  explicit TsSectionPes(scoped_ptr<EsParser> es_parser,

[damienv1, 2014/09/15 22:27:36]

Remove explicit.

+                        TimestampUnroller* timestamp_unroller);
   virtual ~TsSectionPes();
 
   // TsSection implementation.
   virtual bool Parse(bool payload_unit_start_indicator,
                      const uint8* buf, int size) OVERRIDE;
   virtual void Flush() OVERRIDE;
   virtual void Reset() OVERRIDE;
 
  private:
   // Emit a reassembled PES packet.
@@ skipping 10 matching lines @@
   // Bytes of the current PES.
   ByteQueue pes_byte_queue_;
 
   // ES parser.
   scoped_ptr<EsParser> es_parser_;
 
   // Do not start parsing before getting a unit start indicator.
   bool wait_for_pusi_;
 
   // Used to unroll PTS and DTS.
-  bool previous_pts_valid_;
-  int64 previous_pts_;
-  bool previous_dts_valid_;
-  int64 previous_dts_;
+  TimestampUnroller* const timestamp_unroller_;
 
   DISALLOW_COPY_AND_ASSIGN(TsSectionPes);
 };
 
 }  // namespace mp2t
 }  // namespace media
 
 #endif