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

Side by Side Diff: media/formats/mpeg/mpeg_audio_stream_parser_base.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_MPEG_MPEG_AUDIO_STREAM_PARSER_BASE_H_ 5 #ifndef MEDIA_FORMATS_MPEG_MPEG_AUDIO_STREAM_PARSER_BASE_H_
6 #define MEDIA_FORMATS_MPEG_MPEG_AUDIO_STREAM_PARSER_BASE_H_ 6 #define MEDIA_FORMATS_MPEG_MPEG_AUDIO_STREAM_PARSER_BASE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory>
10 #include <set> 11 #include <set>
11 #include <vector> 12 #include <vector>
12 13
13 #include "base/callback.h" 14 #include "base/callback.h"
14 #include "base/macros.h" 15 #include "base/macros.h"
15 #include "media/base/audio_decoder_config.h" 16 #include "media/base/audio_decoder_config.h"
16 #include "media/base/audio_timestamp_helper.h" 17 #include "media/base/audio_timestamp_helper.h"
17 #include "media/base/bit_reader.h" 18 #include "media/base/bit_reader.h"
18 #include "media/base/byte_queue.h" 19 #include "media/base/byte_queue.h"
19 #include "media/base/media_export.h" 20 #include "media/base/media_export.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 InitCB init_cb_; 138 InitCB init_cb_;
138 NewConfigCB config_cb_; 139 NewConfigCB config_cb_;
139 NewBuffersCB new_buffers_cb_; 140 NewBuffersCB new_buffers_cb_;
140 NewMediaSegmentCB new_segment_cb_; 141 NewMediaSegmentCB new_segment_cb_;
141 EndMediaSegmentCB end_of_segment_cb_; 142 EndMediaSegmentCB end_of_segment_cb_;
142 scoped_refptr<MediaLog> media_log_; 143 scoped_refptr<MediaLog> media_log_;
143 144
144 ByteQueue queue_; 145 ByteQueue queue_;
145 146
146 AudioDecoderConfig config_; 147 AudioDecoderConfig config_;
147 scoped_ptr<AudioTimestampHelper> timestamp_helper_; 148 std::unique_ptr<AudioTimestampHelper> timestamp_helper_;
148 bool in_media_segment_; 149 bool in_media_segment_;
149 const uint32_t start_code_mask_; 150 const uint32_t start_code_mask_;
150 const AudioCodec audio_codec_; 151 const AudioCodec audio_codec_;
151 const int codec_delay_; 152 const int codec_delay_;
152 153
153 DISALLOW_COPY_AND_ASSIGN(MPEGAudioStreamParserBase); 154 DISALLOW_COPY_AND_ASSIGN(MPEGAudioStreamParserBase);
154 }; 155 };
155 156
156 } // namespace media 157 } // namespace media
157 158
158 #endif // MEDIA_FORMATS_MPEG_MPEG_AUDIO_STREAM_PARSER_BASE_H_ 159 #endif // MEDIA_FORMATS_MPEG_MPEG_AUDIO_STREAM_PARSER_BASE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698