Mpeg2 TS parser: Es parsing using an ES byte queue.

media/formats/mp2t/es_parser_adts.h

Index: media/formats/mp2t/es_parser_adts.h
diff --git a/media/formats/mp2t/es_parser_adts.h b/media/formats/mp2t/es_parser_adts.h
index 320180460f00b0d044dad6b5714dc9e7bbfae4ad..55516b70619aa0842dd2a7b8d5683ba8c405be14 100644
--- a/media/formats/mp2t/es_parser_adts.h
+++ b/media/formats/mp2t/es_parser_adts.h
@@ -36,19 +36,15 @@ class MEDIA_EXPORT EsParserAdts : public EsParser {
   virtual ~EsParserAdts();
 
   // EsParser implementation.
-  virtual bool Parse(const uint8* buf, int size,
-                     base::TimeDelta pts,
-                     DecodeTimestamp dts) OVERRIDE;
   virtual void Flush() OVERRIDE;
-  virtual void Reset() OVERRIDE;
 
  private:
-  // Used to link a PTS with a byte position in the ES stream.
-  typedef std::pair<int64, base::TimeDelta> EsPts;
-  typedef std::list<EsPts> EsPtsList;
-
   struct AdtsFrame;
 
+  // EsParser implementation.
+  virtual bool ParseFromEsQueue() OVERRIDE;
+  virtual void ResetInternal() OVERRIDE;
+
   // Synchronize the stream on an ADTS syncword (consuming bytes from
   // |es_queue_| if needed).
   // Returns true when a full ADTS frame has been found: in that case
@@ -74,12 +70,6 @@ class MEDIA_EXPORT EsParserAdts : public EsParser {
   // (mp4a.40.5 in the codecs parameter).
   bool sbr_in_mimetype_;
 
-  // Bytes of the ES stream that have not been emitted yet.
-  scoped_ptr<media::OffsetByteQueue> es_queue_;
-
-  // List of PTS associated with a position in the ES stream.
-  EsPtsList pts_list_;
-
   // Interpolated PTS for frames that don't have one.
   scoped_ptr<AudioTimestampHelper> audio_timestamp_helper_;