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

Side by Side Diff: Source/platform/mediastream/MediaStreamComponent.cpp

Issue 534473002: Revert of Oilpan: Move MediaStreamSource, MediaStreamComponent and MediaStreamDescriptor (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Ericsson AB. All rights reserved. 2 * Copyright (C) 2011 Ericsson AB. All rights reserved.
3 * Copyright (C) 2013 Google Inc. All rights reserved. 3 * Copyright (C) 2013 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 22 matching lines...) Expand all
33 33
34 #include "platform/mediastream/MediaStreamComponent.h" 34 #include "platform/mediastream/MediaStreamComponent.h"
35 35
36 #include "platform/UUID.h" 36 #include "platform/UUID.h"
37 #include "platform/audio/AudioBus.h" 37 #include "platform/audio/AudioBus.h"
38 #include "platform/mediastream/MediaStreamSource.h" 38 #include "platform/mediastream/MediaStreamSource.h"
39 #include "public/platform/WebAudioSourceProvider.h" 39 #include "public/platform/WebAudioSourceProvider.h"
40 40
41 namespace blink { 41 namespace blink {
42 42
43 MediaStreamComponent* MediaStreamComponent::create(MediaStreamSource* source) 43 PassRefPtr<MediaStreamComponent> MediaStreamComponent::create(PassRefPtr<MediaSt reamSource> source)
44 { 44 {
45 return new MediaStreamComponent(createCanonicalUUIDString(), source); 45 return adoptRef(new MediaStreamComponent(createCanonicalUUIDString(), source ));
46 } 46 }
47 47
48 MediaStreamComponent* MediaStreamComponent::create(const String& id, MediaStream Source* source) 48 PassRefPtr<MediaStreamComponent> MediaStreamComponent::create(const String& id, PassRefPtr<MediaStreamSource> source)
49 { 49 {
50 return new MediaStreamComponent(id, source); 50 return adoptRef(new MediaStreamComponent(id, source));
51 } 51 }
52 52
53 MediaStreamComponent::MediaStreamComponent(const String& id, MediaStreamSource* source) 53 MediaStreamComponent::MediaStreamComponent(const String& id, PassRefPtr<MediaStr eamSource> source)
54 : m_source(source) 54 : m_source(source)
55 , m_id(id) 55 , m_id(id)
56 , m_enabled(true) 56 , m_enabled(true)
57 , m_muted(false) 57 , m_muted(false)
58 { 58 {
59 ASSERT(m_id.length()); 59 ASSERT(m_id.length());
60 } 60 }
61 61
62 #if ENABLE(WEB_AUDIO) 62 #if ENABLE(WEB_AUDIO)
63 void MediaStreamComponent::AudioSourceProviderImpl::wrap(blink::WebAudioSourcePr ovider* provider) 63 void MediaStreamComponent::AudioSourceProviderImpl::wrap(blink::WebAudioSourcePr ovider* provider)
(...skipping 17 matching lines...) Expand all
81 // Wrap the AudioBus channel data using WebVector. 81 // Wrap the AudioBus channel data using WebVector.
82 size_t n = bus->numberOfChannels(); 82 size_t n = bus->numberOfChannels();
83 blink::WebVector<float*> webAudioData(n); 83 blink::WebVector<float*> webAudioData(n);
84 for (size_t i = 0; i < n; ++i) 84 for (size_t i = 0; i < n; ++i)
85 webAudioData[i] = bus->channel(i)->mutableData(); 85 webAudioData[i] = bus->channel(i)->mutableData();
86 86
87 m_webAudioSourceProvider->provideInput(webAudioData, framesToProcess); 87 m_webAudioSourceProvider->provideInput(webAudioData, framesToProcess);
88 } 88 }
89 #endif // #if ENABLE(WEB_AUDIO) 89 #endif // #if ENABLE(WEB_AUDIO)
90 90
91 void MediaStreamComponent::trace(Visitor* visitor)
92 {
93 visitor->trace(m_source);
94 }
95
96 } // namespace blink 91 } // namespace blink
97 92
OLDNEW
« no previous file with comments | « Source/platform/mediastream/MediaStreamComponent.h ('k') | Source/platform/mediastream/MediaStreamDescriptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698