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

Side by Side Diff: content/renderer/media/media_recorder_handler.h

Issue 2314403003: media_recorder_handler: Changed deprecated ScopedVector to std::vector (Closed)
Patch Set: Created 4 years, 3 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
« no previous file with comments | « no previous file | content/renderer/media/media_recorder_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 CONTENT_RENDERER_MEDIA_MEDIA_RECORDER_HANDLER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_RECORDER_HANDLER_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_RECORDER_HANDLER_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_RECORDER_HANDLER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 // |slice_origin_timestamp_| to track those time chunks. 97 // |slice_origin_timestamp_| to track those time chunks.
98 base::TimeDelta timeslice_; 98 base::TimeDelta timeslice_;
99 base::TimeTicks slice_origin_timestamp_; 99 base::TimeTicks slice_origin_timestamp_;
100 100
101 bool recording_; 101 bool recording_;
102 blink::WebMediaStream media_stream_; // The MediaStream being recorded. 102 blink::WebMediaStream media_stream_; // The MediaStream being recorded.
103 103
104 // |client_| is a weak pointer, and is valid for the lifetime of this object. 104 // |client_| is a weak pointer, and is valid for the lifetime of this object.
105 blink::WebMediaRecorderHandlerClient* client_; 105 blink::WebMediaRecorderHandlerClient* client_;
106 106
107 ScopedVector<VideoTrackRecorder> video_recorders_; 107 std::vector<VideoTrackRecorder*> video_recorders_;
108 ScopedVector<AudioTrackRecorder> audio_recorders_; 108 std::vector<AudioTrackRecorder*> audio_recorders_;
mcasas 2016/09/07 23:04:40 Oops, haven't noticed this. You have to use std::
109 109
110 // Worker class doing the actual Webm Muxing work. 110 // Worker class doing the actual Webm Muxing work.
111 std::unique_ptr<media::WebmMuxer> webm_muxer_; 111 std::unique_ptr<media::WebmMuxer> webm_muxer_;
112 112
113 base::WeakPtrFactory<MediaRecorderHandler> weak_factory_; 113 base::WeakPtrFactory<MediaRecorderHandler> weak_factory_;
114 114
115 DISALLOW_COPY_AND_ASSIGN(MediaRecorderHandler); 115 DISALLOW_COPY_AND_ASSIGN(MediaRecorderHandler);
116 }; 116 };
117 117
118 } // namespace content 118 } // namespace content
119 #endif // CONTENT_RENDERER_MEDIA_MEDIA_RECORDER_HANDLER_H_ 119 #endif // CONTENT_RENDERER_MEDIA_MEDIA_RECORDER_HANDLER_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/media_recorder_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698