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

Unified Diff: content/renderer/media/media_stream_audio_processor.cc

Issue 308643004: changed MSAP to work with 96000KHZ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed the comment. Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/renderer/media/media_stream_audio_processor_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/media_stream_audio_processor.cc
diff --git a/content/renderer/media/media_stream_audio_processor.cc b/content/renderer/media/media_stream_audio_processor.cc
index 460ab8baf4e653d6418f99735d229ab97cddd6b6..2c0fcc30cbbed212dc7be58c79066c02c235ba04 100644
--- a/content/renderer/media/media_stream_audio_processor.cc
+++ b/content/renderer/media/media_stream_audio_processor.cc
@@ -64,13 +64,19 @@ class MediaStreamAudioProcessor::MediaStreamAudioConverter
// |MediaStreamAudioProcessor::capture_converter_|.
thread_checker_.DetachFromThread();
audio_converter_.AddInput(this);
+
// Create and initialize audio fifo and audio bus wrapper.
// The size of the FIFO should be at least twice of the source buffer size
- // or twice of the sink buffer size.
+ // or twice of the sink buffer size. Also, FIFO needs to have enough space
+ // to store pre-processed data before passing the data to
+ // webrtc::AudioProcessing, which requires 10ms as packet size.
+ int max_frame_size = std::max(source_params_.frames_per_buffer(),
+ sink_params_.frames_per_buffer());
int buffer_size = std::max(
- kMaxNumberOfBuffersInFifo * source_params_.frames_per_buffer(),
- kMaxNumberOfBuffersInFifo * sink_params_.frames_per_buffer());
+ kMaxNumberOfBuffersInFifo * max_frame_size,
+ kMaxNumberOfBuffersInFifo * source_params_.sample_rate() / 100);
fifo_.reset(new media::AudioFifo(source_params_.channels(), buffer_size));
+
// TODO(xians): Use CreateWrapper to save one memcpy.
audio_wrapper_ = media::AudioBus::Create(sink_params_.channels(),
sink_params_.frames_per_buffer());
« no previous file with comments | « no previous file | content/renderer/media/media_stream_audio_processor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698