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..53857aedd25bceeac7478df19eb36f9f329634a6 100644 |
--- a/media/formats/mp2t/es_parser_h264.h |
+++ b/media/formats/mp2t/es_parser_h264.h |
@@ -26,6 +26,8 @@ class OffsetByteQueue; |
namespace media { |
namespace mp2t { |
+class EsAdapterVideo; |
+ |
// Remark: |
// In this h264 parser, frame splitting is based on AUD nals. |
// Mpeg2 TS spec: "2.14 Carriage of Rec. ITU-T H.264 | ISO/IEC 14496-10 video" |
@@ -72,9 +74,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_; |
+ scoped_ptr<EsAdapterVideo> es_adapter_; |
scherkus (not reviewing)
2014/07/10 20:45:34
any reason why this needs to be a scoped_ptr<>?
i
damienv1
2014/07/10 22:53:42
I used to have a reset before, then changed it bas
|
// Bytes of the ES stream that have not been emitted yet. |
scoped_ptr<media::OffsetByteQueue> es_queue_; |
@@ -89,6 +89,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 |