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

media/formats/mp2t/es_parser_adts.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_ES_PARSER_ADTS_H_
 #define MEDIA_FORMATS_MP2T_ES_PARSER_ADTS_H_
 
 #include <list>
 #include <utility>
 
@@ skipping 18 matching lines @@
 class MEDIA_EXPORT EsParserAdts : public EsParser {
  public:
   typedef base::Callback<void(const AudioDecoderConfig&)> NewAudioConfigCB;
 
   EsParserAdts(const NewAudioConfigCB& new_audio_config_cb,
                const EmitBufferCB& emit_buffer_cb,
                bool sbr_in_mimetype);
   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;
 
-  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
   // |adts_frame| structure is filled up accordingly.
   // Returns false otherwise (no ADTS syncword found or partial ADTS frame).
   bool LookForAdtsFrame(AdtsFrame* adts_frame);
 
   // Skip an ADTS frame in the ES queue.
   void SkipAdtsFrame(const AdtsFrame& adts_frame);
 
   // Signal any audio configuration change (if any).
   // Return false if the current audio config is not
   // a supported ADTS audio config.
   bool UpdateAudioConfiguration(const uint8* adts_header);
 
   // Callbacks:
   // - to signal a new audio configuration,
   // - to send ES buffers.
   NewAudioConfigCB new_audio_config_cb_;
   EmitBufferCB emit_buffer_cb_;
 
   // True when AAC SBR extension is signalled in the mimetype
   // (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_;
+  //scoped_ptr<media::OffsetByteQueue> es_queue_;

[wolenetz, 2014/08/26 23:01:44]

Why include a commented-out member in source code?
Also lint nit: need space after //.

[damienv1, 2014/08/27 16:23:43]

My mistake, I thought I removed all this temporary code.

 
   // 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_;
 
   // Last audio config.
   AudioDecoderConfig last_audio_decoder_config_;
 
   DISALLOW_COPY_AND_ASSIGN(EsParserAdts);
 };
 
 }  // namespace mp2t
 }  // namespace media
 
 #endif