| 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 <list> | 8 #include <list> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| 11 #include "base/callback.h" | 11 #include "base/callback.h" |
| 12 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
| 13 #include "base/macros.h" |
| 13 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
| 14 #include "base/time/time.h" | 15 #include "base/time/time.h" |
| 15 #include "media/base/audio_decoder_config.h" | 16 #include "media/base/audio_decoder_config.h" |
| 16 #include "media/base/media_export.h" | 17 #include "media/base/media_export.h" |
| 17 #include "media/base/media_log.h" | 18 #include "media/base/media_log.h" |
| 18 #include "media/formats/mp2t/es_parser.h" | 19 #include "media/formats/mp2t/es_parser.h" |
| 19 | 20 |
| 20 namespace media { | 21 namespace media { |
| 21 class AudioTimestampHelper; | 22 class AudioTimestampHelper; |
| 22 class BitReader; | 23 class BitReader; |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 // Last audio config. | 80 // Last audio config. |
| 80 AudioDecoderConfig last_audio_decoder_config_; | 81 AudioDecoderConfig last_audio_decoder_config_; |
| 81 | 82 |
| 82 DISALLOW_COPY_AND_ASSIGN(EsParserMpeg1Audio); | 83 DISALLOW_COPY_AND_ASSIGN(EsParserMpeg1Audio); |
| 83 }; | 84 }; |
| 84 | 85 |
| 85 } // namespace mp2t | 86 } // namespace mp2t |
| 86 } // namespace media | 87 } // namespace media |
| 87 | 88 |
| 88 #endif // MEDIA_FORMATS_MP2T_ES_PARSER_MPEG1AUDIO_H_ | 89 #endif // MEDIA_FORMATS_MP2T_ES_PARSER_MPEG1AUDIO_H_ |
| OLD | NEW |