| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef MEDIA_FORMATS_MP2T_ES_PARSER_MPEG1AUDIO_H_ | 5 #ifndef MEDIA_FORMATS_MP2T_ES_PARSER_MPEG1AUDIO_H_ |
| 6 #define MEDIA_FORMATS_MP2T_ES_PARSER_MPEG1AUDIO_H_ | 6 #define MEDIA_FORMATS_MP2T_ES_PARSER_MPEG1AUDIO_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <list> | 10 #include <list> |
| 11 #include <memory> |
| 11 #include <utility> | 12 #include <utility> |
| 12 | 13 |
| 13 #include "base/callback.h" | 14 #include "base/callback.h" |
| 14 #include "base/compiler_specific.h" | 15 #include "base/compiler_specific.h" |
| 15 #include "base/macros.h" | 16 #include "base/macros.h" |
| 16 #include "base/memory/scoped_ptr.h" | |
| 17 #include "base/time/time.h" | 17 #include "base/time/time.h" |
| 18 #include "media/base/audio_decoder_config.h" | 18 #include "media/base/audio_decoder_config.h" |
| 19 #include "media/base/media_export.h" | 19 #include "media/base/media_export.h" |
| 20 #include "media/base/media_log.h" | 20 #include "media/base/media_log.h" |
| 21 #include "media/formats/mp2t/es_parser.h" | 21 #include "media/formats/mp2t/es_parser.h" |
| 22 | 22 |
| 23 namespace media { | 23 namespace media { |
| 24 class AudioTimestampHelper; | 24 class AudioTimestampHelper; |
| 25 class BitReader; | 25 class BitReader; |
| 26 class OffsetByteQueue; | 26 class OffsetByteQueue; |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 | 70 |
| 71 scoped_refptr<MediaLog> media_log_; | 71 scoped_refptr<MediaLog> media_log_; |
| 72 | 72 |
| 73 // Callbacks: | 73 // Callbacks: |
| 74 // - to signal a new audio configuration, | 74 // - to signal a new audio configuration, |
| 75 // - to send ES buffers. | 75 // - to send ES buffers. |
| 76 NewAudioConfigCB new_audio_config_cb_; | 76 NewAudioConfigCB new_audio_config_cb_; |
| 77 EmitBufferCB emit_buffer_cb_; | 77 EmitBufferCB emit_buffer_cb_; |
| 78 | 78 |
| 79 // Interpolated PTS for frames that don't have one. | 79 // Interpolated PTS for frames that don't have one. |
| 80 scoped_ptr<AudioTimestampHelper> audio_timestamp_helper_; | 80 std::unique_ptr<AudioTimestampHelper> audio_timestamp_helper_; |
| 81 | 81 |
| 82 // Last audio config. | 82 // Last audio config. |
| 83 AudioDecoderConfig last_audio_decoder_config_; | 83 AudioDecoderConfig last_audio_decoder_config_; |
| 84 | 84 |
| 85 DISALLOW_COPY_AND_ASSIGN(EsParserMpeg1Audio); | 85 DISALLOW_COPY_AND_ASSIGN(EsParserMpeg1Audio); |
| 86 }; | 86 }; |
| 87 | 87 |
| 88 } // namespace mp2t | 88 } // namespace mp2t |
| 89 } // namespace media | 89 } // namespace media |
| 90 | 90 |
| 91 #endif // MEDIA_FORMATS_MP2T_ES_PARSER_MPEG1AUDIO_H_ | 91 #endif // MEDIA_FORMATS_MP2T_ES_PARSER_MPEG1AUDIO_H_ |
| OLD | NEW |