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

Side by Side Diff: Source/modules/webaudio/MediaStreamAudioSourceNode.cpp

Issue 85523002: Fixed the crash in the wbaudio source provider when the audio track is going away. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: removed the comment. Created 7 years 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
« no previous file with comments | « Source/modules/webaudio/MediaStreamAudioSourceNode.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012, Google Inc. All rights reserved. 2 * Copyright (C) 2012, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 17 matching lines...) Expand all
28 28
29 #include "modules/webaudio/MediaStreamAudioSourceNode.h" 29 #include "modules/webaudio/MediaStreamAudioSourceNode.h"
30 30
31 #include "platform/Logging.h" 31 #include "platform/Logging.h"
32 #include "modules/webaudio/AudioContext.h" 32 #include "modules/webaudio/AudioContext.h"
33 #include "modules/webaudio/AudioNodeOutput.h" 33 #include "modules/webaudio/AudioNodeOutput.h"
34 #include "wtf/Locker.h" 34 #include "wtf/Locker.h"
35 35
36 namespace WebCore { 36 namespace WebCore {
37 37
38 PassRefPtr<MediaStreamAudioSourceNode> MediaStreamAudioSourceNode::create(AudioC ontext* context, MediaStream* mediaStream, AudioSourceProvider* audioSourceProvi der) 38 PassRefPtr<MediaStreamAudioSourceNode> MediaStreamAudioSourceNode::create(AudioC ontext* context, MediaStream* mediaStream, MediaStreamTrack* audioTrack, AudioSo urceProvider* audioSourceProvider)
39 { 39 {
40 return adoptRef(new MediaStreamAudioSourceNode(context, mediaStream, audioSo urceProvider)); 40 return adoptRef(new MediaStreamAudioSourceNode(context, mediaStream, audioTr ack, audioSourceProvider));
41 } 41 }
42 42
43 MediaStreamAudioSourceNode::MediaStreamAudioSourceNode(AudioContext* context, Me diaStream* mediaStream, AudioSourceProvider* audioSourceProvider) 43 MediaStreamAudioSourceNode::MediaStreamAudioSourceNode(AudioContext* context, Me diaStream* mediaStream, MediaStreamTrack* audioTrack, AudioSourceProvider* audio SourceProvider)
44 : AudioSourceNode(context, context->sampleRate()) 44 : AudioSourceNode(context, context->sampleRate())
45 , m_mediaStream(mediaStream) 45 , m_mediaStream(mediaStream)
46 , m_audioTrack(audioTrack)
46 , m_audioSourceProvider(audioSourceProvider) 47 , m_audioSourceProvider(audioSourceProvider)
47 , m_sourceNumberOfChannels(0) 48 , m_sourceNumberOfChannels(0)
48 { 49 {
49 ScriptWrappable::init(this); 50 ScriptWrappable::init(this);
50 // Default to stereo. This could change depending on the format of the Media Stream's audio track. 51 // Default to stereo. This could change depending on the format of the Media Stream's audio track.
51 addOutput(adoptPtr(new AudioNodeOutput(this, 2))); 52 addOutput(adoptPtr(new AudioNodeOutput(this, 2)));
52 53
53 setNodeType(NodeTypeMediaStreamAudioSource); 54 setNodeType(NodeTypeMediaStreamAudioSource);
54 55
55 initialize(); 56 initialize();
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 } 113 }
113 } 114 }
114 115
115 void MediaStreamAudioSourceNode::reset() 116 void MediaStreamAudioSourceNode::reset()
116 { 117 {
117 } 118 }
118 119
119 } // namespace WebCore 120 } // namespace WebCore
120 121
121 #endif // ENABLE(WEB_AUDIO) 122 #endif // ENABLE(WEB_AUDIO)
OLDNEW
« no previous file with comments | « Source/modules/webaudio/MediaStreamAudioSourceNode.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698