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

Side by Side Diff: media/formats/webm/webm_stream_parser.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_WEBM_WEBM_STREAM_PARSER_H_ 5 #ifndef MEDIA_FORMATS_WEBM_WEBM_STREAM_PARSER_H_
6 #define MEDIA_FORMATS_WEBM_WEBM_STREAM_PARSER_H_ 6 #define MEDIA_FORMATS_WEBM_WEBM_STREAM_PARSER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory>
11
10 #include "base/callback_forward.h" 12 #include "base/callback_forward.h"
11 #include "base/macros.h" 13 #include "base/macros.h"
12 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
13 #include "media/base/audio_decoder_config.h" 15 #include "media/base/audio_decoder_config.h"
14 #include "media/base/byte_queue.h" 16 #include "media/base/byte_queue.h"
15 #include "media/base/media_export.h" 17 #include "media/base/media_export.h"
16 #include "media/base/stream_parser.h" 18 #include "media/base/stream_parser.h"
17 #include "media/base/video_decoder_config.h" 19 #include "media/base/video_decoder_config.h"
18 20
19 namespace media { 21 namespace media {
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 NewBuffersCB new_buffers_cb_; 77 NewBuffersCB new_buffers_cb_;
76 bool ignore_text_tracks_; 78 bool ignore_text_tracks_;
77 EncryptedMediaInitDataCB encrypted_media_init_data_cb_; 79 EncryptedMediaInitDataCB encrypted_media_init_data_cb_;
78 80
79 NewMediaSegmentCB new_segment_cb_; 81 NewMediaSegmentCB new_segment_cb_;
80 EndMediaSegmentCB end_of_segment_cb_; 82 EndMediaSegmentCB end_of_segment_cb_;
81 scoped_refptr<MediaLog> media_log_; 83 scoped_refptr<MediaLog> media_log_;
82 84
83 bool unknown_segment_size_; 85 bool unknown_segment_size_;
84 86
85 scoped_ptr<WebMClusterParser> cluster_parser_; 87 std::unique_ptr<WebMClusterParser> cluster_parser_;
86 ByteQueue byte_queue_; 88 ByteQueue byte_queue_;
87 89
88 DISALLOW_COPY_AND_ASSIGN(WebMStreamParser); 90 DISALLOW_COPY_AND_ASSIGN(WebMStreamParser);
89 }; 91 };
90 92
91 } // namespace media 93 } // namespace media
92 94
93 #endif // MEDIA_FORMATS_WEBM_WEBM_STREAM_PARSER_H_ 95 #endif // MEDIA_FORMATS_WEBM_WEBM_STREAM_PARSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698