wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 892492 - Fix automation on AudioBufferSourceNode.playbackRate. r=ehsan

Browse Source
This commit is contained in:
Paul Adenot 2013-07-12 11:23:21 +02:00
parent 5d8d3ba243
commit aacae3cd50
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
content/media/webaudio/AudioBufferSourceNode.cpp
View File

@ -70,6 +70,11 @@ public:
} }
} }
void SetSourceStream(AudioNodeStream* aSource)
{
mSource = aSource;
}
virtual void SetTimelineParameter(uint32_t aIndex, virtual void SetTimelineParameter(uint32_t aIndex,
const dom::AudioParamTimeline& aValue, const dom::AudioParamTimeline& aValue,
TrackRate aSampleRate) MOZ_OVERRIDE TrackRate aSampleRate) MOZ_OVERRIDE
@ -86,7 +91,7 @@ public:
speex_resampler_destroy(mResampler); speex_resampler_destroy(mResampler);
mResampler = nullptr; mResampler = nullptr;
} }
WebAudioUtils::ConvertAudioParamToTicks(mPlaybackRateTimeline, nullptr, mDestination); WebAudioUtils::ConvertAudioParamToTicks(mPlaybackRateTimeline, mSource, mDestination);
break; break;
default: default:
NS_ERROR("Bad AudioBufferSourceNodeEngine TimelineParameter"); NS_ERROR("Bad AudioBufferSourceNodeEngine TimelineParameter");
@ -425,6 +430,7 @@ public:
float mPlaybackRate; float mPlaybackRate;
float mDopplerShift; float mDopplerShift;
AudioNodeStream* mDestination; AudioNodeStream* mDestination;
AudioNodeStream* mSource;
AudioParamTimeline mPlaybackRateTimeline; AudioParamTimeline mPlaybackRateTimeline;
bool mLoop; bool mLoop;
}; };
@ -444,9 +450,9 @@ AudioBufferSourceNode::AudioBufferSourceNode(AudioContext* aContext)
, mStartCalled(false) , mStartCalled(false)
, mStopped(false) , mStopped(false)
{ {
mStream = aContext->Graph()->CreateAudioNodeStream( AudioBufferSourceNodeEngine* engine = new AudioBufferSourceNodeEngine(this, aContext->Destination());
new AudioBufferSourceNodeEngine(this, aContext->Destination()), mStream = aContext->Graph()->CreateAudioNodeStream(engine, MediaStreamGraph::SOURCE_STREAM);
MediaStreamGraph::SOURCE_STREAM); engine->SetSourceStream(static_cast<AudioNodeStream*>(mStream.get()));
mStream->AddMainThreadListener(this); mStream->AddMainThreadListener(this);
} }

12
content/media/webaudio/WebAudioUtils.cpp
View File

@ -19,15 +19,9 @@ struct ConvertTimeToTickHelper
static int64_t Convert(double aTime, void* aClosure) static int64_t Convert(double aTime, void* aClosure)
{ {
ConvertTimeToTickHelper* This = static_cast<ConvertTimeToTickHelper*> (aClosure); ConvertTimeToTickHelper* This = static_cast<ConvertTimeToTickHelper*> (aClosure);
if (This->mSourceStream) { MOZ_ASSERT(This->mSourceStream->SampleRate() == This->mDestinationStream->SampleRate());
MOZ_ASSERT(This->mSourceStream->SampleRate() == This->mDestinationStream->SampleRate()); return WebAudioUtils::ConvertDestinationStreamTimeToSourceStreamTime(
return WebAudioUtils::ConvertDestinationStreamTimeToSourceStreamTime( aTime, This->mSourceStream, This->mDestinationStream);
aTime, This->mSourceStream, This->mDestinationStream);
} else {
StreamTime streamTime = This->mDestinationStream->GetCurrentPosition();
TrackRate sampleRate = This->mDestinationStream->SampleRate();
return TimeToTicksRoundUp(sampleRate, streamTime + SecondsToMediaTime(aTime));
}
} }
}; };