Mpeg2TS - estimate duration for video frames.

media/formats/mp2t/es_parser_h264.h

Index: media/formats/mp2t/es_parser_h264.h
diff --git a/media/formats/mp2t/es_parser_h264.h b/media/formats/mp2t/es_parser_h264.h
index bf4f4cc1d9cda586f9e82ceaff509c3868c047b0..674b2c650a9c5be50e63a6c5a802806ba58c5c91 100644
--- a/media/formats/mp2t/es_parser_h264.h
+++ b/media/formats/mp2t/es_parser_h264.h
@@ -15,6 +15,7 @@
 #include "base/time/time.h"
 #include "media/base/media_export.h"
 #include "media/base/video_decoder_config.h"
+#include "media/formats/mp2t/es_adapter_video.h"
 #include "media/formats/mp2t/es_parser.h"
 
 namespace media {
@@ -72,9 +73,7 @@ class MEDIA_EXPORT EsParserH264 : NON_EXPORTED_BASE(public EsParser) {
   // Return true if successful.
   bool UpdateVideoDecoderConfig(const H264SPS* sps);
 
-  // Callbacks to pass the stream configuration and the frames.
-  NewVideoConfigCB new_video_config_cb_;
-  EmitBufferCB emit_buffer_cb_;
+  EsAdapterVideo es_adapter_;
 
   // Bytes of the ES stream that have not been emitted yet.
   scoped_ptr<media::OffsetByteQueue> es_queue_;
@@ -89,6 +88,8 @@ class MEDIA_EXPORT EsParserH264 : NON_EXPORTED_BASE(public EsParser) {
 
   // Last video decoder config.
   VideoDecoderConfig last_video_decoder_config_;
+
+  DISALLOW_COPY_AND_ASSIGN(EsParserH264);
 };
 
 }  // namespace mp2t