diff --git a/content/media/GraphDriver.cpp b/content/media/GraphDriver.cpp index f7ee319a9b67..6257b9985ec9 100644 --- a/content/media/GraphDriver.cpp +++ b/content/media/GraphDriver.cpp @@ -630,6 +630,7 @@ AudioCallbackDriver::GetCurrentTime() void AudioCallbackDriver::WaitForNextIteration() { +#if 0 mGraphImpl->GetMonitor().AssertCurrentThreadOwns(); // We can't block on the monitor in the audio callback, so we kick off a new @@ -642,6 +643,7 @@ void AudioCallbackDriver::WaitForNextIteration() new AsyncCubebTask(this, AsyncCubebTask::SLEEP); sleepEvent->Dispatch(); } +#endif } void diff --git a/content/media/MediaStreamGraph.cpp b/content/media/MediaStreamGraph.cpp index 50447fa35add..24d768b18522 100644 --- a/content/media/MediaStreamGraph.cpp +++ b/content/media/MediaStreamGraph.cpp @@ -1450,7 +1450,7 @@ public: NS_ASSERTION(mGraph->mDetectedNotRunning, "We should know the graph thread control loop isn't running!"); - STREAM_LOG(PR_LOG_DEBUG, ("Shutting down graph %p", mGraph)); + STREAM_LOG(PR_LOG_DEBUG, ("Shutting down graph %p", mGraph.get())); if (mGraph->CurrentDriver()->AsAudioCallbackDriver()) { MOZ_ASSERT(!mGraph->CurrentDriver()->AsAudioCallbackDriver()->InCallback());