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

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: media_recorder_handler.cc: Iterate using const auto 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"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/scoped_vector.h"
13 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
14 #include "base/strings/string_piece.h" 13 #include "base/strings/string_piece.h"
15 #include "base/threading/thread_checker.h" 14 #include "base/threading/thread_checker.h"
16 #include "content/common/content_export.h" 15 #include "content/common/content_export.h"
17 #include "content/renderer/media/video_track_recorder.h" 16 #include "content/renderer/media/video_track_recorder.h"
18 #include "third_party/WebKit/public/platform/WebMediaRecorderHandler.h" 17 #include "third_party/WebKit/public/platform/WebMediaRecorderHandler.h"
19 #include "third_party/WebKit/public/platform/WebMediaStream.h" 18 #include "third_party/WebKit/public/platform/WebMediaStream.h"
20 19
21 namespace blink { 20 namespace blink {
22 class WebMediaRecorderHandlerClient; 21 class WebMediaRecorderHandlerClient;
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 // |slice_origin_timestamp_| to track those time chunks. 96 // |slice_origin_timestamp_| to track those time chunks.
98 base::TimeDelta timeslice_; 97 base::TimeDelta timeslice_;
99 base::TimeTicks slice_origin_timestamp_; 98 base::TimeTicks slice_origin_timestamp_;
100 99
101 bool recording_; 100 bool recording_;
102 blink::WebMediaStream media_stream_; // The MediaStream being recorded. 101 blink::WebMediaStream media_stream_; // The MediaStream being recorded.
103 102
104 // |client_| is a weak pointer, and is valid for the lifetime of this object. 103 // |client_| is a weak pointer, and is valid for the lifetime of this object.
105 blink::WebMediaRecorderHandlerClient* client_; 104 blink::WebMediaRecorderHandlerClient* client_;
106 105
107 ScopedVector<VideoTrackRecorder> video_recorders_; 106 std::vector<std::unique_ptr<VideoTrackRecorder>> video_recorders_;
108 ScopedVector<AudioTrackRecorder> audio_recorders_; 107 std::vector<std::unique_ptr<AudioTrackRecorder>> audio_recorders_;
109 108
110 // Worker class doing the actual Webm Muxing work. 109 // Worker class doing the actual Webm Muxing work.
111 std::unique_ptr<media::WebmMuxer> webm_muxer_; 110 std::unique_ptr<media::WebmMuxer> webm_muxer_;
112 111
113 base::WeakPtrFactory<MediaRecorderHandler> weak_factory_; 112 base::WeakPtrFactory<MediaRecorderHandler> weak_factory_;
114 113
115 DISALLOW_COPY_AND_ASSIGN(MediaRecorderHandler); 114 DISALLOW_COPY_AND_ASSIGN(MediaRecorderHandler);
116 }; 115 };
117 116
118 } // namespace content 117 } // namespace content
119 #endif // CONTENT_RENDERER_MEDIA_MEDIA_RECORDER_HANDLER_H_ 118 #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