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..4e47f0d89f3f7ccdaec893f679dbb4a4066767bf 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; |
+ |
// 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 |
@@ -75,10 +71,10 @@ class MEDIA_EXPORT EsParserAdts : public EsParser { |
bool sbr_in_mimetype_; |
// Bytes of the ES stream that have not been emitted yet. |
- scoped_ptr<media::OffsetByteQueue> es_queue_; |
+ //scoped_ptr<media::OffsetByteQueue> es_queue_; |
wolenetz
2014/08/26 23:01:44
Why include a commented-out member in source code?
damienv1
2014/08/27 16:23:43
My mistake, I thought I removed all this temporary
|
// List of PTS associated with a position in the ES stream. |
- EsPtsList pts_list_; |
+ //EsPtsList pts_list_; |
wolenetz
2014/08/26 23:01:44
ditto
damienv1
2014/08/27 16:23:43
Same answer.
|
// Interpolated PTS for frames that don't have one. |
scoped_ptr<AudioTimestampHelper> audio_timestamp_helper_; |