From 7bf9622aff872c82894557c06959f18afc66d951 Mon Sep 17 00:00:00 2001 From: Ethan Hugg Date: Thu, 20 Jun 2013 10:14:04 -0700 Subject: [PATCH] Bug 879743 - Fake audio should be sent at the same rate as fake video r=jesup --- content/media/webrtc/MediaEngine.h | 1 + content/media/webrtc/MediaEngineDefault.cpp | 6 ++++-- content/media/webrtc/MediaEngineDefault.h | 5 ----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/content/media/webrtc/MediaEngine.h b/content/media/webrtc/MediaEngine.h index 1559bc2403c..1a0615b49f8 100644 --- a/content/media/webrtc/MediaEngine.h +++ b/content/media/webrtc/MediaEngine.h @@ -44,6 +44,7 @@ public: static const int DEFAULT_VIDEO_MIN_FPS = 10; static const int DEFAULT_VIDEO_WIDTH = 640; static const int DEFAULT_VIDEO_HEIGHT = 480; + static const int DEFAULT_AUDIO_TIMER_MS = 10; /* Populate an array of video sources in the nsTArray. Also include devices * that are currently unavailable. */ diff --git a/content/media/webrtc/MediaEngineDefault.cpp b/content/media/webrtc/MediaEngineDefault.cpp index dea9647de34..8823a90c125 100644 --- a/content/media/webrtc/MediaEngineDefault.cpp +++ b/content/media/webrtc/MediaEngineDefault.cpp @@ -336,7 +336,7 @@ MediaEngineDefaultAudioSource::Start(SourceMediaStream* aStream, TrackID aID) mTrackID = aID; // 1 Audio frame per Video frame - mTimer->InitWithCallback(this, 1000 / MediaEngineDefaultVideoSource::DEFAULT_VIDEO_FPS, + mTimer->InitWithCallback(this, MediaEngine::DEFAULT_AUDIO_TIMER_MS, nsITimer::TYPE_REPEATING_SLACK); mState = kStarted; @@ -373,7 +373,9 @@ NS_IMETHODIMP MediaEngineDefaultAudioSource::Notify(nsITimer* aTimer) { AudioSegment segment; - segment.InsertNullDataAtStart(AUDIO_RATE/100); // 10ms of fake data + + // Notify timer is set every DEFAULT_AUDIO_TIMER_MS milliseconds. + segment.InsertNullDataAtStart((AUDIO_RATE * MediaEngine::DEFAULT_AUDIO_TIMER_MS) / 1000); mSource->AppendToTrack(mTrackID, &segment); diff --git a/content/media/webrtc/MediaEngineDefault.h b/content/media/webrtc/MediaEngineDefault.h index 6087ab036c7..1f23cad2580 100644 --- a/content/media/webrtc/MediaEngineDefault.h +++ b/content/media/webrtc/MediaEngineDefault.h @@ -58,11 +58,6 @@ public: NS_DECL_ISUPPORTS NS_DECL_NSITIMERCALLBACK - static const int DEFAULT_VIDEO_FPS = 60; - static const int DEFAULT_VIDEO_MIN_FPS = 10; - static const int DEFAULT_VIDEO_WIDTH = 640; - static const int DEFAULT_VIDEO_HEIGHT = 480; - protected: friend class MediaEngineDefault;