OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights
reserved. | 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 #include "public/platform/WebContentDecryptionModule.h" | 71 #include "public/platform/WebContentDecryptionModule.h" |
72 #include "public/platform/WebInbandTextTrack.h" | 72 #include "public/platform/WebInbandTextTrack.h" |
73 #include "wtf/CurrentTime.h" | 73 #include "wtf/CurrentTime.h" |
74 #include "wtf/MathExtras.h" | 74 #include "wtf/MathExtras.h" |
75 #include "wtf/NonCopyingSort.h" | 75 #include "wtf/NonCopyingSort.h" |
76 #include "wtf/Uint8Array.h" | 76 #include "wtf/Uint8Array.h" |
77 #include "wtf/text/CString.h" | 77 #include "wtf/text/CString.h" |
78 | 78 |
79 #if ENABLE(WEB_AUDIO) | 79 #if ENABLE(WEB_AUDIO) |
80 #include "platform/audio/AudioSourceProvider.h" | 80 #include "platform/audio/AudioSourceProvider.h" |
81 #include "modules/webaudio/MediaElementAudioSourceNode.h" | 81 #include "platform/audio/AudioSourceProviderClient.h" |
82 #endif | 82 #endif |
83 | 83 |
84 using namespace std; | 84 using namespace std; |
85 using blink::WebInbandTextTrack; | 85 using blink::WebInbandTextTrack; |
86 using blink::WebMediaPlayer; | 86 using blink::WebMediaPlayer; |
87 using blink::WebMimeRegistry; | 87 using blink::WebMimeRegistry; |
88 | 88 |
89 namespace WebCore { | 89 namespace WebCore { |
90 | 90 |
91 #if !LOG_DISABLED | 91 #if !LOG_DISABLED |
(...skipping 3328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3420 m_audioSourceNode->lock(); | 3420 m_audioSourceNode->lock(); |
3421 #endif | 3421 #endif |
3422 | 3422 |
3423 if (m_mediaSource) | 3423 if (m_mediaSource) |
3424 closeMediaSource(); | 3424 closeMediaSource(); |
3425 | 3425 |
3426 m_player = MediaPlayer::create(this); | 3426 m_player = MediaPlayer::create(this); |
3427 | 3427 |
3428 #if ENABLE(WEB_AUDIO) | 3428 #if ENABLE(WEB_AUDIO) |
3429 if (m_audioSourceNode) { | 3429 if (m_audioSourceNode) { |
3430 // When creating the player, make sure its AudioSourceProvider knows abo
ut the MediaElementAudioSourceNode. | 3430 // When creating the player, make sure its AudioSourceProvider knows abo
ut the client. |
3431 if (audioSourceProvider()) | 3431 if (audioSourceProvider()) |
3432 audioSourceProvider()->setClient(m_audioSourceNode); | 3432 audioSourceProvider()->setClient(m_audioSourceNode); |
3433 | 3433 |
3434 m_audioSourceNode->unlock(); | 3434 m_audioSourceNode->unlock(); |
3435 } | 3435 } |
3436 #endif | 3436 #endif |
3437 } | 3437 } |
3438 | 3438 |
3439 #if ENABLE(WEB_AUDIO) | 3439 #if ENABLE(WEB_AUDIO) |
3440 void HTMLMediaElement::setAudioSourceNode(MediaElementAudioSourceNode* sourceNod
e) | 3440 void HTMLMediaElement::setAudioSourceNode(AudioSourceProviderClient* sourceNode) |
3441 { | 3441 { |
3442 m_audioSourceNode = sourceNode; | 3442 m_audioSourceNode = sourceNode; |
3443 | 3443 |
3444 if (m_audioSourceNode) | 3444 if (m_audioSourceNode) |
3445 m_audioSourceNode->lock(); | 3445 m_audioSourceNode->lock(); |
3446 | 3446 |
3447 if (audioSourceProvider()) | 3447 if (audioSourceProvider()) |
3448 audioSourceProvider()->setClient(m_audioSourceNode); | 3448 audioSourceProvider()->setClient(m_audioSourceNode); |
3449 | 3449 |
3450 if (m_audioSourceNode) | 3450 if (m_audioSourceNode) |
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3634 | 3634 |
3635 void HTMLMediaElement::trace(Visitor* visitor) | 3635 void HTMLMediaElement::trace(Visitor* visitor) |
3636 { | 3636 { |
3637 visitor->trace(m_textTracks); | 3637 visitor->trace(m_textTracks); |
3638 visitor->trace(m_textTracksWhenResourceSelectionBegan); | 3638 visitor->trace(m_textTracksWhenResourceSelectionBegan); |
3639 Supplementable<HTMLMediaElement>::trace(visitor); | 3639 Supplementable<HTMLMediaElement>::trace(visitor); |
3640 HTMLElement::trace(visitor); | 3640 HTMLElement::trace(visitor); |
3641 } | 3641 } |
3642 | 3642 |
3643 } | 3643 } |
OLD | NEW |