Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(358)

Side by Side Diff: media/formats/mp2t/es_parser_adts.h

Issue 1874413003: Convert media/formats to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_ADTS_H_ 5 #ifndef MEDIA_FORMATS_MP2T_ES_PARSER_ADTS_H_
6 #define MEDIA_FORMATS_MP2T_ES_PARSER_ADTS_H_ 6 #define MEDIA_FORMATS_MP2T_ES_PARSER_ADTS_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/formats/mp2t/es_parser.h" 20 #include "media/formats/mp2t/es_parser.h"
21 21
22 namespace media { 22 namespace media {
23 class AudioTimestampHelper; 23 class AudioTimestampHelper;
24 class BitReader; 24 class BitReader;
25 class OffsetByteQueue; 25 class OffsetByteQueue;
26 class StreamParserBuffer; 26 class StreamParserBuffer;
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 // - to signal a new audio configuration, 67 // - to signal a new audio configuration,
68 // - to send ES buffers. 68 // - to send ES buffers.
69 NewAudioConfigCB new_audio_config_cb_; 69 NewAudioConfigCB new_audio_config_cb_;
70 EmitBufferCB emit_buffer_cb_; 70 EmitBufferCB emit_buffer_cb_;
71 71
72 // True when AAC SBR extension is signalled in the mimetype 72 // True when AAC SBR extension is signalled in the mimetype
73 // (mp4a.40.5 in the codecs parameter). 73 // (mp4a.40.5 in the codecs parameter).
74 bool sbr_in_mimetype_; 74 bool sbr_in_mimetype_;
75 75
76 // Interpolated PTS for frames that don't have one. 76 // Interpolated PTS for frames that don't have one.
77 scoped_ptr<AudioTimestampHelper> audio_timestamp_helper_; 77 std::unique_ptr<AudioTimestampHelper> audio_timestamp_helper_;
78 78
79 // Last audio config. 79 // Last audio config.
80 AudioDecoderConfig last_audio_decoder_config_; 80 AudioDecoderConfig last_audio_decoder_config_;
81 81
82 DISALLOW_COPY_AND_ASSIGN(EsParserAdts); 82 DISALLOW_COPY_AND_ASSIGN(EsParserAdts);
83 }; 83 };
84 84
85 } // namespace mp2t 85 } // namespace mp2t
86 } // namespace media 86 } // namespace media
87 87
88 #endif 88 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698