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

Side by Side Diff: Source/core/platform/audio/AudioPullFIFO.cpp

Issue 14628008: Require use of AudioBus::create() to avoid ref-counting issues (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Require use of Created 7 years, 7 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 /* 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 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 20 matching lines...) Expand all
31 #if ENABLE(WEB_AUDIO) 31 #if ENABLE(WEB_AUDIO)
32 32
33 #include "core/platform/audio/AudioPullFIFO.h" 33 #include "core/platform/audio/AudioPullFIFO.h"
34 34
35 namespace WebCore { 35 namespace WebCore {
36 36
37 AudioPullFIFO::AudioPullFIFO(AudioSourceProvider& audioProvider, unsigned number OfChannels, size_t fifoLength, size_t providerSize) 37 AudioPullFIFO::AudioPullFIFO(AudioSourceProvider& audioProvider, unsigned number OfChannels, size_t fifoLength, size_t providerSize)
38 : m_provider(audioProvider) 38 : m_provider(audioProvider)
39 , m_fifo(numberOfChannels, fifoLength) 39 , m_fifo(numberOfChannels, fifoLength)
40 , m_providerSize(providerSize) 40 , m_providerSize(providerSize)
41 , m_tempBus(numberOfChannels, providerSize) 41 , m_tempBus(AudioBus::create(numberOfChannels, providerSize))
42 { 42 {
43 } 43 }
44 44
45 void AudioPullFIFO::consume(AudioBus* destination, size_t framesToConsume) 45 void AudioPullFIFO::consume(AudioBus* destination, size_t framesToConsume)
46 { 46 {
47 if (!destination) 47 if (!destination)
48 return; 48 return;
49 49
50 if (framesToConsume > m_fifo.framesInFifo()) { 50 if (framesToConsume > m_fifo.framesInFifo()) {
51 // We don't have enough data in the FIFO to fulfill the request. Ask for more data. 51 // We don't have enough data in the FIFO to fulfill the request. Ask for more data.
52 fillBuffer(framesToConsume - m_fifo.framesInFifo()); 52 fillBuffer(framesToConsume - m_fifo.framesInFifo());
53 } 53 }
54 54
55 m_fifo.consume(destination, framesToConsume); 55 m_fifo.consume(destination, framesToConsume);
56 } 56 }
57 57
58 void AudioPullFIFO::fillBuffer(size_t numberOfFrames) 58 void AudioPullFIFO::fillBuffer(size_t numberOfFrames)
59 { 59 {
60 // Keep asking the provider to give us data until we have received at least |numberOfFrames| of 60 // Keep asking the provider to give us data until we have received at least |numberOfFrames| of
61 // data. Stuff the data into the FIFO. 61 // data. Stuff the data into the FIFO.
62 size_t framesProvided = 0; 62 size_t framesProvided = 0;
63 63
64 while (framesProvided < numberOfFrames) { 64 while (framesProvided < numberOfFrames) {
65 m_provider.provideInput(&m_tempBus, m_providerSize); 65 m_provider.provideInput(m_tempBus.get(), m_providerSize);
66 66
67 m_fifo.push(&m_tempBus); 67 m_fifo.push(m_tempBus.get());
68 68
69 framesProvided += m_providerSize; 69 framesProvided += m_providerSize;
70 } 70 }
71 } 71 }
72 72
73 } // namespace WebCore 73 } // namespace WebCore
74 74
75 #endif // ENABLE(WEB_AUDIO) 75 #endif // ENABLE(WEB_AUDIO)
OLDNEW
« no previous file with comments | « Source/core/platform/audio/AudioPullFIFO.h ('k') | Source/core/platform/audio/AudioResampler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698