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

Side by Side Diff: third_party/WebKit/Source/modules/mediarecorder/MediaRecorder.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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 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 #include "modules/mediarecorder/MediaRecorder.h" 5 #include "modules/mediarecorder/MediaRecorder.h"
6 6
7 #include "bindings/core/v8/Dictionary.h" 7 #include "bindings/core/v8/Dictionary.h"
8 #include "core/events/Event.h" 8 #include "core/events/Event.h"
9 #include "core/fileapi/Blob.h" 9 #include "core/fileapi/Blob.h"
10 #include "core/inspector/ConsoleMessage.h" 10 #include "core/inspector/ConsoleMessage.h"
11 #include "modules/EventTargetModules.h" 11 #include "modules/EventTargetModules.h"
12 #include "modules/mediarecorder/BlobEvent.h" 12 #include "modules/mediarecorder/BlobEvent.h"
13 #include "platform/ContentType.h" 13 #include "platform/ContentType.h"
14 #include "platform/blob/BlobData.h" 14 #include "platform/blob/BlobData.h"
15 #include "public/platform/Platform.h" 15 #include "public/platform/Platform.h"
16 #include "public/platform/WebMediaStream.h" 16 #include "public/platform/WebMediaStream.h"
17 #include "wtf/PtrUtil.h"
17 #include <algorithm> 18 #include <algorithm>
18 19
19 namespace blink { 20 namespace blink {
20 21
21 namespace { 22 namespace {
22 23
23 // Boundaries of Opus bitrate from https://www.opus-codec.org/. 24 // Boundaries of Opus bitrate from https://www.opus-codec.org/.
24 const int kSmallestPossibleOpusBitRate = 6000; 25 const int kSmallestPossibleOpusBitRate = 6000;
25 const int kLargestAutoAllocatedOpusBitRate = 128000; 26 const int kLargestAutoAllocatedOpusBitRate = 128000;
26 27
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 , m_mimeType(options.mimeType()) 139 , m_mimeType(options.mimeType())
139 , m_stopped(true) 140 , m_stopped(true)
140 , m_ignoreMutedMedia(true) 141 , m_ignoreMutedMedia(true)
141 , m_audioBitsPerSecond(0) 142 , m_audioBitsPerSecond(0)
142 , m_videoBitsPerSecond(0) 143 , m_videoBitsPerSecond(0)
143 , m_state(State::Inactive) 144 , m_state(State::Inactive)
144 , m_dispatchScheduledEventRunner(AsyncMethodRunner<MediaRecorder>::create(th is, &MediaRecorder::dispatchScheduledEvent)) 145 , m_dispatchScheduledEventRunner(AsyncMethodRunner<MediaRecorder>::create(th is, &MediaRecorder::dispatchScheduledEvent))
145 { 146 {
146 DCHECK(m_stream->getTracks().size()); 147 DCHECK(m_stream->getTracks().size());
147 148
148 m_recorderHandler = adoptPtr(Platform::current()->createMediaRecorderHandler ()); 149 m_recorderHandler = wrapUnique(Platform::current()->createMediaRecorderHandl er());
149 DCHECK(m_recorderHandler); 150 DCHECK(m_recorderHandler);
150 151
151 if (!m_recorderHandler) { 152 if (!m_recorderHandler) {
152 exceptionState.throwDOMException(NotSupportedError, "No MediaRecorder ha ndler can be created."); 153 exceptionState.throwDOMException(NotSupportedError, "No MediaRecorder ha ndler can be created.");
153 return; 154 return;
154 } 155 }
155 156
156 AllocateVideoAndAudioBitrates(exceptionState, context, options, stream, &m_a udioBitsPerSecond, &m_videoBitsPerSecond); 157 AllocateVideoAndAudioBitrates(exceptionState, context, options, stream, &m_a udioBitsPerSecond, &m_videoBitsPerSecond);
157 158
158 const ContentType contentType(m_mimeType); 159 const ContentType contentType(m_mimeType);
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 DEFINE_TRACE(MediaRecorder) 352 DEFINE_TRACE(MediaRecorder)
352 { 353 {
353 visitor->trace(m_stream); 354 visitor->trace(m_stream);
354 visitor->trace(m_dispatchScheduledEventRunner); 355 visitor->trace(m_dispatchScheduledEventRunner);
355 visitor->trace(m_scheduledEvents); 356 visitor->trace(m_scheduledEvents);
356 EventTargetWithInlineData::trace(visitor); 357 EventTargetWithInlineData::trace(visitor);
357 ActiveDOMObject::trace(visitor); 358 ActiveDOMObject::trace(visitor);
358 } 359 }
359 360
360 } // namespace blink 361 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698